From ab6bbfda1dbcb21079bec1fb9942e907f5eaab1b Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Fri, 2 Oct 2020 09:59:39 +1000 Subject: [PATCH] Fix all remaining Qt QFlags deprecated constructor warnings --- .../auto_generated/geometry/qgspoint.sip.in | 2 +- .../auto_generated/symbology/qgssymbol.sip.in | 2 +- .../qgseffectstackpropertieswidget.sip.in | 2 +- .../layout/qgslayoutviewrubberband.sip.in | 8 +++---- .../qgsoptionsdialogbase.sip.in | 2 +- .../qgsrasterlayersaveasdialog.sip.in | 2 +- .../auto_generated/qgssublayersdialog.sip.in | 2 +- .../symbology/qgsdashspacedialog.sip.in | 2 +- .../processing/qgsalgorithmdissolve.h | 2 +- .../qgsalgorithmextractzmvalues.cpp | 2 +- .../qgsalgorithmzonalstatistics.cpp | 2 +- ...gsalgorithmzonalstatisticsfeaturebased.cpp | 2 +- .../geometry_checker/qgsgeometrycheck.cpp | 2 +- .../qgsgeometryselfintersectioncheck.cpp | 2 +- src/app/3d/qgs3dmeasuredialog.h | 2 +- .../browser/qgsinbuiltdataitemproviders.cpp | 6 ++--- src/app/dwg/qgsdwgimportdialog.h | 2 +- src/app/georeferencer/qgsgeorefmainwindow.h | 2 +- src/app/labeling/qgslabelpropertydialog.h | 2 +- src/app/layout/qgslayoutmanagerdialog.h | 2 +- src/app/layout/qgsreportsectionmodel.cpp | 2 +- src/app/mesh/qgsmeshcalculatordialog.h | 2 +- src/app/qgisapp.cpp | 8 +++---- src/app/qgsannotationwidget.h | 2 +- src/app/qgsappscreenshots.h | 2 +- src/app/qgscustomprojectiondialog.h | 2 +- src/app/qgsdatumtransformtablewidget.cpp | 4 ++-- src/app/qgsdisplayangle.h | 2 +- src/app/qgsdxfexportdialog.cpp | 2 +- src/app/qgsdxfexportdialog.h | 2 +- src/app/qgsformannotationdialog.h | 2 +- src/app/qgshtmlannotationdialog.h | 2 +- src/app/qgsidentifyresultsdialog.h | 2 +- src/app/qgslayercapabilitiesmodel.cpp | 8 +++---- src/app/qgsmapsavedialog.cpp | 2 +- src/app/qgsmeasuredialog.h | 2 +- src/app/qgsmergeattributesdialog.h | 2 +- src/app/qgsoptions.cpp | 2 +- src/app/qgsprojectlayergroupdialog.h | 2 +- src/app/qgsrastercalcdialog.h | 2 +- src/app/qgsselectbyformdialog.h | 2 +- src/app/qgsstatisticalsummarydockwidget.cpp | 6 ++--- src/app/qgssvgannotationdialog.h | 2 +- src/app/qgstextannotationdialog.h | 2 +- src/core/auth/qgsauthmanager.cpp | 4 ++-- src/core/auth/qgsauthmethod.h | 6 ++--- .../classification/qgsclassificationmethod.h | 2 +- src/core/dxf/qgsdxfexport.cpp | 4 ++-- src/core/dxf/qgsdxfexport.h | 2 +- src/core/geometry/qgspoint.h | 2 +- src/core/labeling/qgslabelfeature.h | 2 +- .../labeling/qgslabelingenginesettings.cpp | 2 +- src/core/layout/qgslayoutexporter.cpp | 2 +- src/core/layout/qgslayoutitem.cpp | 2 +- src/core/layout/qgslayoutitemmap.cpp | 2 +- src/core/layout/qgslayoutitemmap.h | 2 +- src/core/layout/qgslayoutitemmapgrid.cpp | 4 ++-- src/core/layout/qgslayoutmodel.h | 2 +- src/core/locator/qgslocatorfilter.cpp | 2 +- .../processing/qgsprocessingalgorithm.cpp | 2 +- src/core/processing/qgsprocessingprovider.cpp | 2 +- .../ogr/qgsgeopackageproviderconnection.h | 2 +- src/core/providers/ogr/qgsogrprovider.cpp | 4 ++-- src/core/providers/ogr/qgsogrprovider.h | 2 +- .../qgsabstractdatabaseproviderconnection.h | 6 ++--- src/core/qgsbookmarkmodel.cpp | 2 +- src/core/qgsfeaturerequest.cpp | 5 ----- src/core/qgsfeaturerequest.h | 2 +- src/core/qgsmaplayermodel.cpp | 2 +- src/core/qgspaintenginehack.cpp | 2 +- src/core/qgsspatialindex.cpp | 4 ++-- src/core/qgsvectordataprovider.cpp | 2 +- src/core/qgsvectorfilewriter.cpp | 6 ++--- src/core/qgsvectorlayer.cpp | 6 ++--- src/core/qgsvectorlayercache.cpp | 2 +- src/core/qgsvectorlayertemporalproperties.cpp | 2 +- src/core/raster/qgscolorrampshader.cpp | 1 + .../qgsrasterlayertemporalproperties.cpp | 2 +- src/core/scalebar/qgsscalebarrenderer.cpp | 2 +- .../symbology/qgsinvertedpolygonrenderer.cpp | 2 +- src/core/symbology/qgslinesymbollayer.cpp | 4 ++-- .../symbology/qgspointdistancerenderer.cpp | 2 +- src/core/symbology/qgssymbol.h | 2 +- src/core/symbology/qgssymbollayerutils.cpp | 4 ++-- .../attributetable/qgsfeaturefilterwidget.cpp | 6 ++--- .../effects/qgseffectstackpropertieswidget.h | 2 +- src/gui/labeling/qgslabelinggui.cpp | 2 +- src/gui/layout/qgsgeopdflayertreemodel.cpp | 2 +- .../qgslayoutattributeselectiondialog.h | 2 +- src/gui/layout/qgslayoutguiutils.cpp | 6 ++--- src/gui/layout/qgslayoutviewrubberband.h | 8 +++---- src/gui/layout/qgslayoutviewtool.h | 2 +- src/gui/layout/qgslayoutviewtoolselect.cpp | 4 ++-- src/gui/layout/qgslayoutviewtoolzoom.cpp | 4 ++-- src/gui/ogr/qgsvectorlayersaveasdialog.h | 4 ++-- .../models/qgsmodelcomponentgraphicitem.cpp | 2 +- .../models/qgsmodelviewrubberband.h | 4 ++-- src/gui/processing/models/qgsmodelviewtool.h | 2 +- .../models/qgsmodelviewtoolselect.cpp | 4 ++-- .../models/qgsmodelviewtoolzoom.cpp | 4 ++-- .../qgsprocessingmaplayercombobox.cpp | 2 +- .../qgsprocessingoutputdestinationwidget.cpp | 2 +- .../processing/qgsprocessingtoolboxmodel.cpp | 2 +- .../processing/qgsprocessingtoolboxmodel.h | 2 +- .../qgsprocessingwidgetwrapperimpl.cpp | 10 ++++----- src/gui/providers/ogr/qgsogrsourceselect.h | 2 +- src/gui/qgsadvanceddigitizingdockwidget.cpp | 2 +- src/gui/qgsadvanceddigitizingdockwidget.h | 2 +- src/gui/qgscolorbutton.cpp | 2 +- src/gui/qgscolordialog.cpp | 2 +- src/gui/qgsdatumtransformdialog.cpp | 2 +- src/gui/qgsdatumtransformdialog.h | 2 +- src/gui/qgsgui.cpp | 2 +- src/gui/qgsguiutils.h | 2 +- src/gui/qgsmaplayeractionregistry.h | 4 ++-- src/gui/qgsoptionsdialogbase.h | 2 +- src/gui/qgsrasterlayersaveasdialog.h | 2 +- src/gui/qgssublayersdialog.h | 2 +- src/gui/qgssymbolbutton.cpp | 2 +- src/gui/qgstablewidgetitem.cpp | 3 ++- .../symbology/qgscptcitycolorrampdialog.cpp | 2 +- src/gui/symbology/qgsdashspacedialog.h | 2 +- .../vector/qgsattributesformproperties.cpp | 2 +- src/gui/vector/qgsjoindialog.h | 2 +- src/gui/vector/qgswmsdimensiondialog.h | 2 +- src/native/qgsnative.cpp | 2 +- .../offline_editing_plugin_gui.h | 2 +- .../offline_editing_progress_dialog.h | 2 +- src/providers/arcgisrest/qgsafsdataitems.cpp | 2 +- src/providers/arcgisrest/qgsamsdataitems.cpp | 2 +- src/providers/mssql/qgsmssqldataitems.cpp | 2 +- .../mssql/qgsmssqlproviderconnection.h | 2 +- .../qgspostgresdataitemguiprovider.cpp | 2 +- src/providers/postgres/qgspostgresprovider.h | 2 +- .../postgres/qgspostgresproviderconnection.h | 2 +- .../spatialite/qgsspatialitedataitems.cpp | 2 +- .../spatialite/qgsspatialiteprovider.h | 2 +- .../qgsspatialiteproviderconnection.h | 2 +- src/providers/wcs/qgswcsdataitems.cpp | 2 +- src/providers/wfs/qgswfsdataitems.cpp | 2 +- src/providers/wfs/qgswfsprovider.h | 2 +- src/providers/wms/qgstilescalewidget.h | 2 +- .../wms/qgswmsdataitemguiproviders.cpp | 2 +- src/providers/wms/qgswmtsdimensions.h | 2 +- src/server/services/wms/qgswmsrenderer.cpp | 2 +- tests/src/analysis/testqgsprocessing.cpp | 22 +++++++++---------- tests/src/core/testqgslayoutcontext.cpp | 2 +- tests/src/core/testqgslayoutmodel.cpp | 2 +- tests/src/core/testqgslayoututils.cpp | 4 ++-- tests/src/core/testqgsstatisticalsummary.cpp | 4 ++-- tests/src/core/testqgstaskmanager.cpp | 2 +- tests/src/gui/testprocessinggui.cpp | 4 ++-- tests/src/gui/testqgsdatumtransformdialog.cpp | 2 +- .../src/gui/testqgsnewdatabasetablewidget.cpp | 8 +++---- tests/src/gui/testqgsprocessingmodel.cpp | 10 ++++----- 155 files changed, 221 insertions(+), 226 deletions(-) diff --git a/python/core/auto_generated/geometry/qgspoint.sip.in b/python/core/auto_generated/geometry/qgspoint.sip.in index 0c3c0c442dbd..08a783942145 100644 --- a/python/core/auto_generated/geometry/qgspoint.sip.in +++ b/python/core/auto_generated/geometry/qgspoint.sip.in @@ -369,7 +369,7 @@ Example virtual bool fromWkt( const QString &wkt ); - virtual QByteArray asWkb( QgsAbstractGeometry::WkbFlags = 0 ) const; + virtual QByteArray asWkb( QgsAbstractGeometry::WkbFlags = QgsAbstractGeometry::WkbFlags() ) const; virtual QString asWkt( int precision = 17 ) const; diff --git a/python/core/auto_generated/symbology/qgssymbol.sip.in b/python/core/auto_generated/symbology/qgssymbol.sip.in index 39e114eb9b28..b28262e826f3 100644 --- a/python/core/auto_generated/symbology/qgssymbol.sip.in +++ b/python/core/auto_generated/symbology/qgssymbol.sip.in @@ -601,7 +601,7 @@ class QgsSymbolRenderContext public: - QgsSymbolRenderContext( QgsRenderContext &c, QgsUnitTypes::RenderUnit u, qreal opacity = 1.0, bool selected = false, QgsSymbol::RenderHints renderHints = 0, const QgsFeature *f = 0, const QgsFields &fields = QgsFields(), const QgsMapUnitScale &mapUnitScale = QgsMapUnitScale() ); + QgsSymbolRenderContext( QgsRenderContext &c, QgsUnitTypes::RenderUnit u, qreal opacity = 1.0, bool selected = false, QgsSymbol::RenderHints renderHints = QgsSymbol::RenderHints(), const QgsFeature *f = 0, const QgsFields &fields = QgsFields(), const QgsMapUnitScale &mapUnitScale = QgsMapUnitScale() ); %Docstring Constructor for QgsSymbolRenderContext diff --git a/python/gui/auto_generated/effects/qgseffectstackpropertieswidget.sip.in b/python/gui/auto_generated/effects/qgseffectstackpropertieswidget.sip.in index ab19016031e1..47d5f8cf8074 100644 --- a/python/gui/auto_generated/effects/qgseffectstackpropertieswidget.sip.in +++ b/python/gui/auto_generated/effects/qgseffectstackpropertieswidget.sip.in @@ -149,7 +149,7 @@ and reordering effects within the stack. %End public: - QgsEffectStackPropertiesDialog( QgsEffectStack *stack, QWidget *parent /TransferThis/ = 0, Qt::WindowFlags f = 0 ); + QgsEffectStackPropertiesDialog( QgsEffectStack *stack, QWidget *parent /TransferThis/ = 0, Qt::WindowFlags f = Qt::WindowFlags() ); %Docstring QgsEffectStackPropertiesDialog constructor diff --git a/python/gui/auto_generated/layout/qgslayoutviewrubberband.sip.in b/python/gui/auto_generated/layout/qgslayoutviewrubberband.sip.in index 5d43393d1d5c..6549fa54131f 100644 --- a/python/gui/auto_generated/layout/qgslayoutviewrubberband.sip.in +++ b/python/gui/auto_generated/layout/qgslayoutviewrubberband.sip.in @@ -53,7 +53,7 @@ Called when a rubber band should be updated to reflect a temporary ending ``position`` (in layout coordinate space). %End - virtual QRectF finish( QPointF position = QPointF(), Qt::KeyboardModifiers modifiers = 0 ) = 0; + virtual QRectF finish( QPointF position = QPointF(), Qt::KeyboardModifiers modifiers = Qt::KeyboardModifiers() ) = 0; %Docstring Called when a rubber band use has finished and the rubber band is no longer required. @@ -159,7 +159,7 @@ Constructor for QgsLayoutViewRectangularRubberBand. virtual void update( QPointF position, Qt::KeyboardModifiers modifiers ); - virtual QRectF finish( QPointF position = QPointF(), Qt::KeyboardModifiers modifiers = 0 ); + virtual QRectF finish( QPointF position = QPointF(), Qt::KeyboardModifiers modifiers = Qt::KeyboardModifiers() ); }; @@ -190,7 +190,7 @@ Constructor for QgsLayoutViewEllipticalRubberBand. virtual void update( QPointF position, Qt::KeyboardModifiers modifiers ); - virtual QRectF finish( QPointF position = QPointF(), Qt::KeyboardModifiers modifiers = 0 ); + virtual QRectF finish( QPointF position = QPointF(), Qt::KeyboardModifiers modifiers = Qt::KeyboardModifiers() ); }; @@ -221,7 +221,7 @@ Constructor for QgsLayoutViewTriangleRubberBand. virtual void update( QPointF position, Qt::KeyboardModifiers modifiers ); - virtual QRectF finish( QPointF position = QPointF(), Qt::KeyboardModifiers modifiers = 0 ); + virtual QRectF finish( QPointF position = QPointF(), Qt::KeyboardModifiers modifiers = Qt::KeyboardModifiers() ); }; diff --git a/python/gui/auto_generated/qgsoptionsdialogbase.sip.in b/python/gui/auto_generated/qgsoptionsdialogbase.sip.in index f666a9de3a1b..9c3e2243a1c8 100644 --- a/python/gui/auto_generated/qgsoptionsdialogbase.sip.in +++ b/python/gui/auto_generated/qgsoptionsdialogbase.sip.in @@ -38,7 +38,7 @@ To use: %End public: - QgsOptionsDialogBase( const QString &settingsKey, QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = 0, QgsSettings *settings = 0 ); + QgsOptionsDialogBase( const QString &settingsKey, QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = Qt::WindowFlags(), QgsSettings *settings = 0 ); %Docstring Constructor diff --git a/python/gui/auto_generated/qgsrasterlayersaveasdialog.sip.in b/python/gui/auto_generated/qgsrasterlayersaveasdialog.sip.in index dc2bf521c29c..8e9d7823ef2b 100644 --- a/python/gui/auto_generated/qgsrasterlayersaveasdialog.sip.in +++ b/python/gui/auto_generated/qgsrasterlayersaveasdialog.sip.in @@ -38,7 +38,7 @@ class QgsRasterLayerSaveAsDialog: QDialog const QgsCoordinateReferenceSystem &layerCrs, const QgsCoordinateReferenceSystem ¤tCrs, QWidget *parent /TransferThis/ = 0, - Qt::WindowFlags f = 0 ); + Qt::WindowFlags f = Qt::WindowFlags() ); %Docstring Constructor for QgsRasterLayerSaveAsDialog %End diff --git a/python/gui/auto_generated/qgssublayersdialog.sip.in b/python/gui/auto_generated/qgssublayersdialog.sip.in index 5292c8f99885..7c64a529f560 100644 --- a/python/gui/auto_generated/qgssublayersdialog.sip.in +++ b/python/gui/auto_generated/qgssublayersdialog.sip.in @@ -51,7 +51,7 @@ class QgsSublayersDialog : QDialog QgsSublayersDialog( ProviderType providerType, const QString &name, QWidget *parent /TransferThis/ = 0, - Qt::WindowFlags fl = 0, + Qt::WindowFlags fl = Qt::WindowFlags(), const QString &dataSourceUri = QString() ); %Docstring Construct a new QgsSublayersDialog object - a dialog to select which sub layers to be imported from a data source (e.g. from geopackage or zipfile) diff --git a/python/gui/auto_generated/symbology/qgsdashspacedialog.sip.in b/python/gui/auto_generated/symbology/qgsdashspacedialog.sip.in index 40d9da02c444..e5b200373c6c 100644 --- a/python/gui/auto_generated/symbology/qgsdashspacedialog.sip.in +++ b/python/gui/auto_generated/symbology/qgsdashspacedialog.sip.in @@ -53,7 +53,7 @@ A dialog to enter a custom dash space pattern for lines %End public: - QgsDashSpaceDialog( const QVector &v, QWidget *parent /TransferThis/ = 0, Qt::WindowFlags f = 0 ); + QgsDashSpaceDialog( const QVector &v, QWidget *parent /TransferThis/ = 0, Qt::WindowFlags f = Qt::WindowFlags() ); %Docstring Constructor for QgsDashSpaceDialog %End diff --git a/src/analysis/processing/qgsalgorithmdissolve.h b/src/analysis/processing/qgsalgorithmdissolve.h index ec324a44ae56..e5e8f7201c99 100644 --- a/src/analysis/processing/qgsalgorithmdissolve.h +++ b/src/analysis/processing/qgsalgorithmdissolve.h @@ -34,7 +34,7 @@ class QgsCollectorAlgorithm : public QgsProcessingAlgorithm protected: QVariantMap processCollection( const QVariantMap ¶meters, QgsProcessingContext &context, QgsProcessingFeedback *feedback, - const std::function& )> &collector, int maxQueueLength = 0, QgsProcessingFeatureSource::Flags sourceFlags = nullptr ); + const std::function& )> &collector, int maxQueueLength = 0, QgsProcessingFeatureSource::Flags sourceFlags = QgsProcessingFeatureSource::Flags() ); }; /** diff --git a/src/analysis/processing/qgsalgorithmextractzmvalues.cpp b/src/analysis/processing/qgsalgorithmextractzmvalues.cpp index a946381ec14c..2b7458871eea 100644 --- a/src/analysis/processing/qgsalgorithmextractzmvalues.cpp +++ b/src/analysis/processing/qgsalgorithmextractzmvalues.cpp @@ -91,7 +91,7 @@ bool QgsExtractZMValuesAlgorithmBase::prepareAlgorithm( const QVariantMap ¶m mPrefix = parameterAsString( parameters, QStringLiteral( "COLUMN_PREFIX" ), context ); const QList< int > stats = parameterAsEnums( parameters, QStringLiteral( "SUMMARIES" ), context ); - mStats = nullptr; + mStats = QgsStatisticalSummary::Statistics(); for ( int s : stats ) { mStats |= STATS.at( s ); diff --git a/src/analysis/processing/qgsalgorithmzonalstatistics.cpp b/src/analysis/processing/qgsalgorithmzonalstatistics.cpp index ef90a6ba9c40..b0df51506b76 100644 --- a/src/analysis/processing/qgsalgorithmzonalstatistics.cpp +++ b/src/analysis/processing/qgsalgorithmzonalstatistics.cpp @@ -118,7 +118,7 @@ bool QgsZonalStatisticsAlgorithm::prepareAlgorithm( const QVariantMap ¶meter mPrefix = parameterAsString( parameters, QStringLiteral( "COLUMN_PREFIX" ), context ); const QList< int > stats = parameterAsEnums( parameters, QStringLiteral( "STATISTICS" ), context ); - mStats = nullptr; + mStats = QgsZonalStatistics::Statistics(); for ( int s : stats ) { mStats |= STATS.at( s ); diff --git a/src/analysis/processing/qgsalgorithmzonalstatisticsfeaturebased.cpp b/src/analysis/processing/qgsalgorithmzonalstatisticsfeaturebased.cpp index 0e641a51742f..9244ed39a7fa 100644 --- a/src/analysis/processing/qgsalgorithmzonalstatisticsfeaturebased.cpp +++ b/src/analysis/processing/qgsalgorithmzonalstatisticsfeaturebased.cpp @@ -113,7 +113,7 @@ bool QgsZonalStatisticsFeatureBasedAlgorithm::prepareAlgorithm( const QVariantMa mPrefix = parameterAsString( parameters, QStringLiteral( "COLUMN_PREFIX" ), context ); const QList< int > stats = parameterAsEnums( parameters, QStringLiteral( "STATISTICS" ), context ); - mStats = nullptr; + mStats = QgsZonalStatistics::Statistics(); for ( int s : stats ) { mStats |= STATS.at( s ); diff --git a/src/analysis/vector/geometry_checker/qgsgeometrycheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometrycheck.cpp index f68439770303..f3d6063c0c1c 100644 --- a/src/analysis/vector/geometry_checker/qgsgeometrycheck.cpp +++ b/src/analysis/vector/geometry_checker/qgsgeometrycheck.cpp @@ -44,7 +44,7 @@ bool QgsGeometryCheck::isCompatible( QgsVectorLayer *layer ) const QgsGeometryCheck::Flags QgsGeometryCheck::flags() const { - return nullptr; + return QgsGeometryCheck::Flags(); } void QgsGeometryCheck::fixError( const QMap &featurePools, QgsGeometryCheckError *error, int method, const QMap &mergeAttributeIndices, QgsGeometryCheck::Changes &changes ) const diff --git a/src/analysis/vector/geometry_checker/qgsgeometryselfintersectioncheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometryselfintersectioncheck.cpp index f6976ae0689b..99fa3c305aed 100644 --- a/src/analysis/vector/geometry_checker/qgsgeometryselfintersectioncheck.cpp +++ b/src/analysis/vector/geometry_checker/qgsgeometryselfintersectioncheck.cpp @@ -351,7 +351,7 @@ QString QgsGeometrySelfIntersectionCheck::factoryDescription() QgsGeometryCheck::Flags QgsGeometrySelfIntersectionCheck::factoryFlags() { - return nullptr; + return QgsGeometryCheck::Flags(); } QString QgsGeometrySelfIntersectionCheck::factoryId() diff --git a/src/app/3d/qgs3dmeasuredialog.h b/src/app/3d/qgs3dmeasuredialog.h index a46d031f56c7..90422f2dd627 100644 --- a/src/app/3d/qgs3dmeasuredialog.h +++ b/src/app/3d/qgs3dmeasuredialog.h @@ -31,7 +31,7 @@ class Qgs3DMeasureDialog : public QDialog, private Ui::QgsMeasureBase public: // Constructor - Qgs3DMeasureDialog( Qgs3DMapToolMeasureLine *tool, Qt::WindowFlags f = nullptr ); + Qgs3DMeasureDialog( Qgs3DMapToolMeasureLine *tool, Qt::WindowFlags f = Qt::WindowFlags() ); //! Save position void saveWindowLocation(); diff --git a/src/app/browser/qgsinbuiltdataitemproviders.cpp b/src/app/browser/qgsinbuiltdataitemproviders.cpp index f742efdd8071..50e4648cf252 100644 --- a/src/app/browser/qgsinbuiltdataitemproviders.cpp +++ b/src/app/browser/qgsinbuiltdataitemproviders.cpp @@ -705,7 +705,7 @@ void QgsProjectItemGuiProvider::populateContextMenu( QgsDataItem *item, QMenu *m { p.accept( &visitor ); override.release(); - QgsStyleManagerDialog dlg( &style, QgisApp::instance(), nullptr, true ); + QgsStyleManagerDialog dlg( &style, QgisApp::instance(), Qt::WindowFlags(), true ); dlg.setFavoritesGroupVisible( false ); dlg.setSmartGroupsVisible( false ); QFileInfo fi( projectPath ); @@ -917,8 +917,8 @@ void QgsDatabaseItemGuiProvider::populateContextMenu( QgsDataItem *item, QMenu * const QString geometryColumn { dlg.geometryColumnName() }; const QgsWkbTypes::Type geometryType { dlg.geometryType() }; const bool createSpatialIndex { dlg.createSpatialIndex() && - geometryType != QgsWkbTypes::NoGeometry && - geometryType != QgsWkbTypes::Unknown }; + geometryType != QgsWkbTypes::NoGeometry && + geometryType != QgsWkbTypes::Unknown }; const QgsCoordinateReferenceSystem crs { dlg.crs( ) }; // This flag tells to the provider that field types do not need conversion QMap options { { QStringLiteral( "skipConvertFields" ), true } }; diff --git a/src/app/dwg/qgsdwgimportdialog.h b/src/app/dwg/qgsdwgimportdialog.h index 7b9692304841..35e2859b1f21 100644 --- a/src/app/dwg/qgsdwgimportdialog.h +++ b/src/app/dwg/qgsdwgimportdialog.h @@ -28,7 +28,7 @@ class QgsDwgImportDialog : public QDialog, private Ui::QgsDwgImportBase { Q_OBJECT public: - QgsDwgImportDialog( QWidget *parent = nullptr, Qt::WindowFlags f = nullptr ); + QgsDwgImportDialog( QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags() ); ~QgsDwgImportDialog() override; private slots: diff --git a/src/app/georeferencer/qgsgeorefmainwindow.h b/src/app/georeferencer/qgsgeorefmainwindow.h index ccc2ade7f502..0cb47c14d514 100644 --- a/src/app/georeferencer/qgsgeorefmainwindow.h +++ b/src/app/georeferencer/qgsgeorefmainwindow.h @@ -54,7 +54,7 @@ class QgsGeoreferencerMainWindow : public QMainWindow, private Ui::QgsGeorefPlug Q_OBJECT public: - QgsGeoreferencerMainWindow( QWidget *parent = nullptr, Qt::WindowFlags fl = nullptr ); + QgsGeoreferencerMainWindow( QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags() ); ~QgsGeoreferencerMainWindow() override; protected: diff --git a/src/app/labeling/qgslabelpropertydialog.h b/src/app/labeling/qgslabelpropertydialog.h index 03c720a3a989..7d3ad1a1abca 100644 --- a/src/app/labeling/qgslabelpropertydialog.h +++ b/src/app/labeling/qgslabelpropertydialog.h @@ -38,7 +38,7 @@ class APP_EXPORT QgsLabelPropertyDialog: public QDialog, private Ui::QgsLabelPro bool isPinned, const QgsPalLayerSettings &layerSettings, QWidget *parent = nullptr, - Qt::WindowFlags f = nullptr ); + Qt::WindowFlags f = Qt::WindowFlags() ); //! Returns properties changed by the user const QgsAttributeMap &changedProperties() const { return mChangedProperties; } diff --git a/src/app/layout/qgslayoutmanagerdialog.h b/src/app/layout/qgslayoutmanagerdialog.h index 4d7286c917e2..12d423ededae 100644 --- a/src/app/layout/qgslayoutmanagerdialog.h +++ b/src/app/layout/qgslayoutmanagerdialog.h @@ -36,7 +36,7 @@ class QgsLayoutManagerDialog: public QDialog, private Ui::QgsLayoutManagerBase { Q_OBJECT public: - QgsLayoutManagerDialog( QWidget *parent = nullptr, Qt::WindowFlags f = nullptr ); + QgsLayoutManagerDialog( QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags() ); void addTemplates( const QMap &templates ); diff --git a/src/app/layout/qgsreportsectionmodel.cpp b/src/app/layout/qgsreportsectionmodel.cpp index 41f04ab8b280..b26c5f88986b 100644 --- a/src/app/layout/qgsreportsectionmodel.cpp +++ b/src/app/layout/qgsreportsectionmodel.cpp @@ -30,7 +30,7 @@ QgsReportSectionModel::QgsReportSectionModel( QgsReport *report, QObject *parent Qt::ItemFlags QgsReportSectionModel::flags( const QModelIndex &index ) const { if ( !index.isValid() ) - return nullptr; + return Qt::ItemFlags(); return QAbstractItemModel::flags( index ); } diff --git a/src/app/mesh/qgsmeshcalculatordialog.h b/src/app/mesh/qgsmeshcalculatordialog.h index 89ab939a18e6..5401f1fcfbaf 100644 --- a/src/app/mesh/qgsmeshcalculatordialog.h +++ b/src/app/mesh/qgsmeshcalculatordialog.h @@ -36,7 +36,7 @@ class APP_EXPORT QgsMeshCalculatorDialog: public QDialog, private Ui::QgsMeshCal * \param parent widget * \param f window flags */ - QgsMeshCalculatorDialog( QgsMeshLayer *meshLayer = nullptr, QWidget *parent = nullptr, Qt::WindowFlags f = nullptr ); + QgsMeshCalculatorDialog( QgsMeshLayer *meshLayer = nullptr, QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags() ); ~QgsMeshCalculatorDialog(); //! Returns new mesh calculator created from dialog options diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp index 0680916297d8..750ec8bbc9e0 100644 --- a/src/app/qgisapp.cpp +++ b/src/app/qgisapp.cpp @@ -1700,7 +1700,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh } // QgisApp ctor QgisApp::QgisApp() - : QMainWindow( nullptr, nullptr ) + : QMainWindow( nullptr, Qt::WindowFlags() ) #ifdef Q_OS_MAC , mWindowMenu( nullptr ) #endif @@ -5765,7 +5765,7 @@ bool QgisApp::askUserForZipItemLayers( const QString &path ) // initialize a selection dialog and display it. case QgsSublayersDialog::PromptAlways: case QgsSublayersDialog::PromptIfNeeded: - QgsSublayersDialog chooseSublayersDialog( QgsSublayersDialog::Vsifile, QStringLiteral( "vsi" ), this, nullptr, path ); + QgsSublayersDialog chooseSublayersDialog( QgsSublayersDialog::Vsifile, QStringLiteral( "vsi" ), this, Qt::WindowFlags(), path ); QgsSublayersDialog::LayerDefinitionList layers; for ( int i = 0; i < zipItem->children().size(); i++ ) @@ -5858,7 +5858,7 @@ QList< QgsMapLayer * > QgisApp::askUserForGDALSublayers( QgsRasterLayer *layer ) } // We initialize a selection dialog and display it. - QgsSublayersDialog chooseSublayersDialog( QgsSublayersDialog::Gdal, QStringLiteral( "gdal" ), this, nullptr, layer->dataProvider()->dataSourceUri() ); + QgsSublayersDialog chooseSublayersDialog( QgsSublayersDialog::Gdal, QStringLiteral( "gdal" ), this, Qt::WindowFlags(), layer->dataProvider()->dataSourceUri() ); chooseSublayersDialog.setShowAddToGroupCheckbox( true ); QgsSublayersDialog::LayerDefinitionList layers; @@ -6077,7 +6077,7 @@ QList QgisApp::askUserForOGRSublayers( QgsVectorLayer *layer, con // Check if the current layer uri contains the // We initialize a selection dialog and display it. - QgsSublayersDialog chooseSublayersDialog( QgsSublayersDialog::Ogr, QStringLiteral( "ogr" ), this, nullptr, layer->dataProvider()->dataSourceUri() ); + QgsSublayersDialog chooseSublayersDialog( QgsSublayersDialog::Ogr, QStringLiteral( "ogr" ), this, Qt::WindowFlags(), layer->dataProvider()->dataSourceUri() ); chooseSublayersDialog.setShowAddToGroupCheckbox( true ); chooseSublayersDialog.populateLayerTable( list ); diff --git a/src/app/qgsannotationwidget.h b/src/app/qgsannotationwidget.h index 5d88e0c60113..64e0b89dc2c1 100644 --- a/src/app/qgsannotationwidget.h +++ b/src/app/qgsannotationwidget.h @@ -34,7 +34,7 @@ class APP_EXPORT QgsAnnotationWidget: public QWidget, private Ui::QgsAnnotationW Q_OBJECT public: - QgsAnnotationWidget( QgsMapCanvasAnnotationItem *item, QWidget *parent = nullptr, Qt::WindowFlags f = nullptr ); + QgsAnnotationWidget( QgsMapCanvasAnnotationItem *item, QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags() ); //! Returns the annotation frame symbol fill color QColor backgroundColor(); diff --git a/src/app/qgsappscreenshots.h b/src/app/qgsappscreenshots.h index 108ec684df46..3046ff8c9a89 100644 --- a/src/app/qgsappscreenshots.h +++ b/src/app/qgsappscreenshots.h @@ -59,7 +59,7 @@ class QgsAppScreenShots QgsAppScreenShots( const QString &saveDirectory ); //! if categories is null, then takes all categories - void takePicturesOf( Categories categories = nullptr ); + void takePicturesOf( Categories categories = Categories() ); //! set gradient size void setGradientSize( int size ); diff --git a/src/app/qgscustomprojectiondialog.h b/src/app/qgscustomprojectiondialog.h index 1f7b2e13cbda..ed0646717a29 100644 --- a/src/app/qgscustomprojectiondialog.h +++ b/src/app/qgscustomprojectiondialog.h @@ -32,7 +32,7 @@ class APP_EXPORT QgsCustomProjectionDialog : public QDialog, private Ui::QgsCust { Q_OBJECT public: - QgsCustomProjectionDialog( QWidget *parent = nullptr, Qt::WindowFlags fl = nullptr ); + QgsCustomProjectionDialog( QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags() ); public slots: void pbnCalculate_clicked(); diff --git a/src/app/qgsdatumtransformtablewidget.cpp b/src/app/qgsdatumtransformtablewidget.cpp index f4320e177960..9223c6d64cca 100644 --- a/src/app/qgsdatumtransformtablewidget.cpp +++ b/src/app/qgsdatumtransformtablewidget.cpp @@ -258,7 +258,7 @@ QgsDatumTransformTableWidget::QgsDatumTransformTableWidget( QWidget *parent ) void QgsDatumTransformTableWidget::addDatumTransform() { - QgsDatumTransformDialog dlg( QgsCoordinateReferenceSystem(), QgsCoordinateReferenceSystem(), true, false, false, QPair< int, int >(), nullptr, nullptr, QString(), QgisApp::instance()->mapCanvas() ); + QgsDatumTransformDialog dlg( QgsCoordinateReferenceSystem(), QgsCoordinateReferenceSystem(), true, false, false, QPair< int, int >(), nullptr, Qt::WindowFlags(), QString(), QgisApp::instance()->mapCanvas() ); if ( dlg.exec() ) { const QgsDatumTransformDialog::TransformInfo dt = dlg.selectedDatumTransform(); @@ -307,7 +307,7 @@ void QgsDatumTransformTableWidget::editDatumTransform( const QModelIndex &index ( sourceTransform != -1 || destinationTransform != -1 ) ) #endif { - QgsDatumTransformDialog dlg( sourceCrs, destinationCrs, true, false, false, qMakePair( sourceTransform, destinationTransform ), nullptr, nullptr, proj, QgisApp::instance()->mapCanvas(), allowFallback ); + QgsDatumTransformDialog dlg( sourceCrs, destinationCrs, true, false, false, qMakePair( sourceTransform, destinationTransform ), nullptr, Qt::WindowFlags(), proj, QgisApp::instance()->mapCanvas(), allowFallback ); if ( dlg.exec() ) { const QgsDatumTransformDialog::TransformInfo dt = dlg.selectedDatumTransform(); diff --git a/src/app/qgsdisplayangle.h b/src/app/qgsdisplayangle.h index df5f39962ef9..e52f297b004d 100644 --- a/src/app/qgsdisplayangle.h +++ b/src/app/qgsdisplayangle.h @@ -27,7 +27,7 @@ class APP_EXPORT QgsDisplayAngle: public QDialog, private Ui::QgsDisplayAngleBas Q_OBJECT public: - QgsDisplayAngle( QgsMapToolMeasureAngle *tool = nullptr, Qt::WindowFlags f = nullptr ); + QgsDisplayAngle( QgsMapToolMeasureAngle *tool = nullptr, Qt::WindowFlags f = Qt::WindowFlags() ); /** * Sets the measured angle value (in radians). The value is going to diff --git a/src/app/qgsdxfexportdialog.cpp b/src/app/qgsdxfexportdialog.cpp index 0ff5aa45fcd1..ea8c770c9d32 100644 --- a/src/app/qgsdxfexportdialog.cpp +++ b/src/app/qgsdxfexportdialog.cpp @@ -442,7 +442,7 @@ QgsDxfExportDialog::QgsDxfExportDialog( QWidget *parent, Qt::WindowFlags f ) mTreeView->setItemDelegate( mFieldSelectorDelegate ); QgsLayerTreeModel *model = new QgsVectorLayerAndAttributeModel( mLayerTreeGroup, this ); - model->setFlags( nullptr ); + model->setFlags( QgsLayerTreeModel::Flags() ); mTreeView->setModel( model ); mTreeView->resizeColumnToContents( 0 ); mTreeView->header()->show(); diff --git a/src/app/qgsdxfexportdialog.h b/src/app/qgsdxfexportdialog.h index 4a1172c080ee..ca00084eb2c1 100644 --- a/src/app/qgsdxfexportdialog.h +++ b/src/app/qgsdxfexportdialog.h @@ -76,7 +76,7 @@ class QgsDxfExportDialog : public QDialog, private Ui::QgsDxfExportDialogBase { Q_OBJECT public: - QgsDxfExportDialog( QWidget *parent = nullptr, Qt::WindowFlags f = nullptr ); + QgsDxfExportDialog( QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags() ); ~QgsDxfExportDialog() override; QList< QgsDxfExport::DxfLayer > layers() const; diff --git a/src/app/qgsformannotationdialog.h b/src/app/qgsformannotationdialog.h index befdd781514e..c067cf58afcb 100644 --- a/src/app/qgsformannotationdialog.h +++ b/src/app/qgsformannotationdialog.h @@ -25,7 +25,7 @@ class APP_EXPORT QgsFormAnnotationDialog: public QDialog, private Ui::QgsFormAnn { Q_OBJECT public: - QgsFormAnnotationDialog( QgsMapCanvasAnnotationItem *item, QWidget *parent = nullptr, Qt::WindowFlags f = nullptr ); + QgsFormAnnotationDialog( QgsMapCanvasAnnotationItem *item, QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags() ); private: QgsMapCanvasAnnotationItem *mItem = nullptr; diff --git a/src/app/qgshtmlannotationdialog.h b/src/app/qgshtmlannotationdialog.h index 0b5ac3da4409..a4bbecb31f9c 100644 --- a/src/app/qgshtmlannotationdialog.h +++ b/src/app/qgshtmlannotationdialog.h @@ -25,7 +25,7 @@ class APP_EXPORT QgsHtmlAnnotationDialog: public QDialog, private Ui::QgsFormAnn { Q_OBJECT public: - QgsHtmlAnnotationDialog( QgsMapCanvasAnnotationItem *item, QWidget *parent = nullptr, Qt::WindowFlags f = nullptr ); + QgsHtmlAnnotationDialog( QgsMapCanvasAnnotationItem *item, QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags() ); private: QgsMapCanvasAnnotationItem *mItem = nullptr; diff --git a/src/app/qgsidentifyresultsdialog.h b/src/app/qgsidentifyresultsdialog.h index 38d9e503726f..e49211f1ce6d 100644 --- a/src/app/qgsidentifyresultsdialog.h +++ b/src/app/qgsidentifyresultsdialog.h @@ -129,7 +129,7 @@ class APP_EXPORT QgsIdentifyResultsDialog: public QDialog, private Ui::QgsIdenti * takes its own copy of the QgsAttributeAction so * that it is independent of whoever created it. */ - QgsIdentifyResultsDialog( QgsMapCanvas *canvas, QWidget *parent = nullptr, Qt::WindowFlags f = nullptr ); + QgsIdentifyResultsDialog( QgsMapCanvas *canvas, QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags() ); ~QgsIdentifyResultsDialog() override; diff --git a/src/app/qgslayercapabilitiesmodel.cpp b/src/app/qgslayercapabilitiesmodel.cpp index 9f4609071356..7afa346d040c 100644 --- a/src/app/qgslayercapabilitiesmodel.cpp +++ b/src/app/qgslayercapabilitiesmodel.cpp @@ -155,7 +155,7 @@ Qt::ItemFlags QgsLayerCapabilitiesModel::flags( const QModelIndex &idx ) const } else { - return nullptr; + return Qt::ItemFlags(); } } else if ( idx.column() == ReadOnlyColumn ) @@ -166,7 +166,7 @@ Qt::ItemFlags QgsLayerCapabilitiesModel::flags( const QModelIndex &idx ) const } else { - return nullptr; + return Qt::ItemFlags(); } } else if ( idx.column() == SearchableColumn ) @@ -177,7 +177,7 @@ Qt::ItemFlags QgsLayerCapabilitiesModel::flags( const QModelIndex &idx ) const } else { - return nullptr; + return Qt::ItemFlags(); } } else if ( idx.column() == RequiredColumn ) @@ -185,7 +185,7 @@ Qt::ItemFlags QgsLayerCapabilitiesModel::flags( const QModelIndex &idx ) const return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsUserCheckable; } } - return nullptr; + return Qt::ItemFlags(); } QgsMapLayer *QgsLayerCapabilitiesModel::mapLayer( const QModelIndex &idx ) const diff --git a/src/app/qgsmapsavedialog.cpp b/src/app/qgsmapsavedialog.cpp index 06dc0ea602b2..5b0b366553fe 100644 --- a/src/app/qgsmapsavedialog.cpp +++ b/src/app/qgsmapsavedialog.cpp @@ -574,7 +574,7 @@ void QgsMapSaveDialog::onAccepted() void QgsMapSaveDialog::updatePdfExportWarning() { - QStringList layers = QgsMapSettingsUtils::containsAdvancedEffects( mMapCanvas->mapSettings(), mGeoPDFGroupBox->isChecked() ? QgsMapSettingsUtils::EffectsCheckFlags( QgsMapSettingsUtils::EffectsCheckFlag::IgnoreGeoPdfSupportedEffects ) : nullptr ); + QStringList layers = QgsMapSettingsUtils::containsAdvancedEffects( mMapCanvas->mapSettings(), mGeoPDFGroupBox->isChecked() ? QgsMapSettingsUtils::EffectsCheckFlags( QgsMapSettingsUtils::EffectsCheckFlag::IgnoreGeoPdfSupportedEffects ) : QgsMapSettingsUtils::EffectsCheckFlags() ); if ( !layers.isEmpty() ) { mInfoDetails = tr( "The following layer(s) use advanced effects:\n\n%1\n\nRasterizing map is recommended for proper rendering." ).arg( diff --git a/src/app/qgsmeasuredialog.h b/src/app/qgsmeasuredialog.h index bd54aa1b721a..a2b67de9007f 100644 --- a/src/app/qgsmeasuredialog.h +++ b/src/app/qgsmeasuredialog.h @@ -35,7 +35,7 @@ class APP_EXPORT QgsMeasureDialog : public QDialog, private Ui::QgsMeasureBase public: //! Constructor - QgsMeasureDialog( QgsMeasureTool *tool, Qt::WindowFlags f = nullptr ); + QgsMeasureDialog( QgsMeasureTool *tool, Qt::WindowFlags f = Qt::WindowFlags() ); //! Save position void saveWindowLocation(); diff --git a/src/app/qgsmergeattributesdialog.h b/src/app/qgsmergeattributesdialog.h index 1ac3a618c2ec..a913b12b3f09 100644 --- a/src/app/qgsmergeattributesdialog.h +++ b/src/app/qgsmergeattributesdialog.h @@ -43,7 +43,7 @@ class APP_EXPORT QgsMergeAttributesDialog: public QDialog, private Ui::QgsMergeA }; - QgsMergeAttributesDialog( const QgsFeatureList &features, QgsVectorLayer *vl, QgsMapCanvas *canvas, QWidget *parent = nullptr, Qt::WindowFlags f = nullptr ); + QgsMergeAttributesDialog( const QgsFeatureList &features, QgsVectorLayer *vl, QgsMapCanvas *canvas, QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags() ); ~QgsMergeAttributesDialog() override; QgsAttributes mergedAttributes() const; diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp index 05176dd70bd5..2307b5ed7d9b 100644 --- a/src/app/qgsoptions.cpp +++ b/src/app/qgsoptions.cpp @@ -1915,7 +1915,7 @@ void QgsOptions::editGdalDriver( const QString &driverName ) if ( driverName.isEmpty() ) return; - QgsDialog dlg( this, nullptr, QDialogButtonBox::Ok | QDialogButtonBox::Cancel ); + QgsDialog dlg( this, Qt::WindowFlags(), QDialogButtonBox::Ok | QDialogButtonBox::Cancel ); QVBoxLayout *layout = dlg.layout(); QString title = tr( "Create Options - %1 Driver" ).arg( driverName ); if ( driverName == QLatin1String( "_pyramids" ) ) diff --git a/src/app/qgsprojectlayergroupdialog.h b/src/app/qgsprojectlayergroupdialog.h index dee1b94dc7a7..0501dacd1a98 100644 --- a/src/app/qgsprojectlayergroupdialog.h +++ b/src/app/qgsprojectlayergroupdialog.h @@ -49,7 +49,7 @@ class APP_EXPORT QgsProjectLayerGroupDialog: public QDialog, private Ui::QgsProj Q_OBJECT public: //! Constructor. If a project file is given, the groups/layers are displayed directly and the file selection hidden - QgsProjectLayerGroupDialog( QWidget *parent = nullptr, const QString &projectFile = QString(), Qt::WindowFlags f = nullptr ); + QgsProjectLayerGroupDialog( QWidget *parent = nullptr, const QString &projectFile = QString(), Qt::WindowFlags f = Qt::WindowFlags() ); ~QgsProjectLayerGroupDialog() override; QStringList selectedGroups() const; diff --git a/src/app/qgsrastercalcdialog.h b/src/app/qgsrastercalcdialog.h index b5f063591069..37b309936d95 100644 --- a/src/app/qgsrastercalcdialog.h +++ b/src/app/qgsrastercalcdialog.h @@ -35,7 +35,7 @@ class APP_EXPORT QgsRasterCalcDialog: public QDialog, private Ui::QgsRasterCalcD * \param parent widget * \param f window flags */ - QgsRasterCalcDialog( QgsRasterLayer *rasterLayer = nullptr, QWidget *parent = nullptr, Qt::WindowFlags f = nullptr ); + QgsRasterCalcDialog( QgsRasterLayer *rasterLayer = nullptr, QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags() ); QString formulaString() const; QString outputFile() const; diff --git a/src/app/qgsselectbyformdialog.h b/src/app/qgsselectbyformdialog.h index 1c98ddea614c..c91558b23e88 100644 --- a/src/app/qgsselectbyformdialog.h +++ b/src/app/qgsselectbyformdialog.h @@ -47,7 +47,7 @@ class APP_EXPORT QgsSelectByFormDialog : public QDialog */ QgsSelectByFormDialog( QgsVectorLayer *layer, const QgsAttributeEditorContext &context = QgsAttributeEditorContext(), - QWidget *parent = nullptr, Qt::WindowFlags fl = nullptr ); + QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags() ); /** * Sets the message bar to display feedback from the form in. This is used in the search/filter diff --git a/src/app/qgsstatisticalsummarydockwidget.cpp b/src/app/qgsstatisticalsummarydockwidget.cpp index 70e990848afc..d4244c6d0448 100644 --- a/src/app/qgsstatisticalsummarydockwidget.cpp +++ b/src/app/qgsstatisticalsummarydockwidget.cpp @@ -236,7 +236,7 @@ void QgsStatisticalSummaryDockWidget::updateNumericStatistics() } QList< QgsStatisticalSummary::Statistic > statsToDisplay; - QgsStatisticalSummary::Statistics statsToCalc = nullptr; + QgsStatisticalSummary::Statistics statsToCalc = QgsStatisticalSummary::Statistics(); const auto displayStats = *sDisplayStats(); for ( QgsStatisticalSummary::Statistic stat : displayStats ) { @@ -293,7 +293,7 @@ void QgsStatisticalSummaryDockWidget::updateStringStatistics() QVariantList values = mGatherer->values(); QList< QgsStringStatisticalSummary::Statistic > statsToDisplay; - QgsStringStatisticalSummary::Statistics statsToCalc = nullptr; + QgsStringStatisticalSummary::Statistics statsToCalc = QgsStringStatisticalSummary::Statistics(); const auto displayStringStats = *sDisplayStringStats(); for ( QgsStringStatisticalSummary::Statistic stat : displayStringStats ) { @@ -418,7 +418,7 @@ void QgsStatisticalSummaryDockWidget::updateDateTimeStatistics() QVariantList values = mGatherer->values(); QList< QgsDateTimeStatisticalSummary::Statistic > statsToDisplay; - QgsDateTimeStatisticalSummary::Statistics statsToCalc = nullptr; + QgsDateTimeStatisticalSummary::Statistics statsToCalc = QgsDateTimeStatisticalSummary::Statistics(); const auto displayDateTimeStats = *sDisplayDateTimeStats(); for ( QgsDateTimeStatisticalSummary::Statistic stat : displayDateTimeStats ) { diff --git a/src/app/qgssvgannotationdialog.h b/src/app/qgssvgannotationdialog.h index 9ce1dc6a61be..e731bec310ba 100644 --- a/src/app/qgssvgannotationdialog.h +++ b/src/app/qgssvgannotationdialog.h @@ -28,7 +28,7 @@ class APP_EXPORT QgsSvgAnnotationDialog: public QDialog, private Ui::QgsFormAnno { Q_OBJECT public: - QgsSvgAnnotationDialog( QgsMapCanvasAnnotationItem *item, QWidget *parent = nullptr, Qt::WindowFlags f = nullptr ); + QgsSvgAnnotationDialog( QgsMapCanvasAnnotationItem *item, QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags() ); private slots: void mBrowseToolButton_clicked(); diff --git a/src/app/qgstextannotationdialog.h b/src/app/qgstextannotationdialog.h index 22dda4e1f22e..e0f08d064fa2 100644 --- a/src/app/qgstextannotationdialog.h +++ b/src/app/qgstextannotationdialog.h @@ -29,7 +29,7 @@ class APP_EXPORT QgsTextAnnotationDialog: public QDialog, private Ui::QgsTextAnn { Q_OBJECT public: - QgsTextAnnotationDialog( QgsMapCanvasAnnotationItem *item, QWidget *parent = nullptr, Qt::WindowFlags f = nullptr ); + QgsTextAnnotationDialog( QgsMapCanvasAnnotationItem *item, QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags() ); protected: diff --git a/src/core/auth/qgsauthmanager.cpp b/src/core/auth/qgsauthmanager.cpp index 5c7be41f0613..3cddd325393e 100644 --- a/src/core/auth/qgsauthmanager.cpp +++ b/src/core/auth/qgsauthmanager.cpp @@ -1041,14 +1041,14 @@ QWidget *QgsAuthManager::authMethodEditWidget( const QString &authMethodKey, QWi QgsAuthMethod::Expansions QgsAuthManager::supportedAuthMethodExpansions( const QString &authcfg ) { if ( isDisabled() ) - return QgsAuthMethod::Expansions( nullptr ); + return QgsAuthMethod::Expansions(); QgsAuthMethod *authmethod = configAuthMethod( authcfg ); if ( authmethod ) { return authmethod->supportedExpansions(); } - return QgsAuthMethod::Expansions( nullptr ); + return QgsAuthMethod::Expansions(); } bool QgsAuthManager::storeAuthenticationConfig( QgsAuthMethodConfig &mconfig ) diff --git a/src/core/auth/qgsauthmethod.h b/src/core/auth/qgsauthmethod.h index a471b2227a9d..442ff45dd4e9 100644 --- a/src/core/auth/qgsauthmethod.h +++ b/src/core/auth/qgsauthmethod.h @@ -173,9 +173,7 @@ class CORE_EXPORT QgsAuthMethod : public QObject * \note Non-public since this is an abstract base class */ explicit QgsAuthMethod() - : mExpansions( QgsAuthMethod::Expansions( nullptr ) ) - , mDataProviders( QStringList() ) - , mMutex( QMutex::RecursionMode::Recursive ) + : mMutex( QMutex::RecursionMode::Recursive ) {} @@ -190,7 +188,7 @@ class CORE_EXPORT QgsAuthMethod : public QObject //! Sets list of data providers this auth method supports void setDataProviders( const QStringList &dataproviders ) { mDataProviders = dataproviders; } - QgsAuthMethod::Expansions mExpansions; + QgsAuthMethod::Expansions mExpansions = QgsAuthMethod::Expansions(); QStringList mDataProviders; int mVersion = 0; QMutex mMutex; diff --git a/src/core/classification/qgsclassificationmethod.h b/src/core/classification/qgsclassificationmethod.h index 3e6882b25c24..bba279887c25 100644 --- a/src/core/classification/qgsclassificationmethod.h +++ b/src/core/classification/qgsclassificationmethod.h @@ -333,7 +333,7 @@ class CORE_EXPORT QgsClassificationMethod SIP_ABSTRACT QList breaksToClasses( const QList &breaks ) const; // implementation properties (set by initialization) - MethodProperties mFlags = nullptr; + MethodProperties mFlags = MethodProperties(); int mCodeComplexity = 1; // parameters (set by setters) diff --git a/src/core/dxf/qgsdxfexport.cpp b/src/core/dxf/qgsdxfexport.cpp index 25f4cead0270..dd840d7e80c5 100644 --- a/src/core/dxf/qgsdxfexport.cpp +++ b/src/core/dxf/qgsdxfexport.cpp @@ -636,7 +636,7 @@ void QgsDxfExport::writeEntities() // iterate through the maplayers for ( DxfLayerJob *job : qgis::as_const( mJobs ) ) { - QgsSymbolRenderContext sctx( mRenderContext, QgsUnitTypes::RenderMillimeters, 1.0, false, nullptr, nullptr ); + QgsSymbolRenderContext sctx( mRenderContext, QgsUnitTypes::RenderMillimeters, 1.0, false, QgsSymbol::RenderHints(), nullptr ); if ( mSymbologyExport == QgsDxfExport::SymbolLayerSymbology && ( job->renderer->capabilities() & QgsFeatureRenderer::SymbolLevels ) && @@ -794,7 +794,7 @@ void QgsDxfExport::writeEntitiesSymbolLevels( DxfLayerJob *job ) const QList scopes = job->renderContext.expressionContext().scopes(); for ( QgsExpressionContextScope *scope : scopes ) ctx.expressionContext().appendScope( new QgsExpressionContextScope( *scope ) ); - QgsSymbolRenderContext sctx( ctx, QgsUnitTypes::RenderMillimeters, 1.0, false, nullptr, nullptr ); + QgsSymbolRenderContext sctx( ctx, QgsUnitTypes::RenderMillimeters, 1.0, false, QgsSymbol::RenderHints(), nullptr ); // get iterator QgsFeatureRequest req; diff --git a/src/core/dxf/qgsdxfexport.h b/src/core/dxf/qgsdxfexport.h index 14303e35c227..b9817022a27c 100644 --- a/src/core/dxf/qgsdxfexport.h +++ b/src/core/dxf/qgsdxfexport.h @@ -617,7 +617,7 @@ class CORE_EXPORT QgsDxfExport : public QgsLabelSink double mFactor = 1.0; bool mForce2d = false; - QgsDxfExport::Flags mFlags = nullptr; + QgsDxfExport::Flags mFlags = QgsDxfExport::Flags(); void appendCurve( const QgsCurve &c, QVector &points, QVector &bulges ); void appendLineString( const QgsLineString &ls, QVector &points, QVector &bulges ); diff --git a/src/core/geometry/qgspoint.h b/src/core/geometry/qgspoint.h index 2b1e8dce4b05..7d7c9c85aae2 100644 --- a/src/core/geometry/qgspoint.h +++ b/src/core/geometry/qgspoint.h @@ -490,7 +490,7 @@ class CORE_EXPORT QgsPoint: public QgsAbstractGeometry void clear() override; bool fromWkb( QgsConstWkbPtr &wkb ) override; bool fromWkt( const QString &wkt ) override; - QByteArray asWkb( QgsAbstractGeometry::WkbFlags = nullptr ) const override; + QByteArray asWkb( QgsAbstractGeometry::WkbFlags = 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; diff --git a/src/core/labeling/qgslabelfeature.h b/src/core/labeling/qgslabelfeature.h index b942f7054e61..50dd01e556aa 100644 --- a/src/core/labeling/qgslabelfeature.h +++ b/src/core/labeling/qgslabelfeature.h @@ -570,7 +570,7 @@ class CORE_EXPORT QgsLabelFeature //! Distance to smooth angle of line start and end when calculating overruns double mOverrunSmoothDistance = 0; - QgsLabeling::LinePlacementFlags mArrangementFlags = nullptr; + QgsLabeling::LinePlacementFlags mArrangementFlags = QgsLabeling::LinePlacementFlags(); QgsLabeling::PolygonPlacementFlags mPolygonPlacementFlags = QgsLabeling::PolygonPlacementFlag::AllowPlacementInsideOfPolygon; private: diff --git a/src/core/labeling/qgslabelingenginesettings.cpp b/src/core/labeling/qgslabelingenginesettings.cpp index a628a7eda89b..382464a70123 100644 --- a/src/core/labeling/qgslabelingenginesettings.cpp +++ b/src/core/labeling/qgslabelingenginesettings.cpp @@ -35,7 +35,7 @@ void QgsLabelingEngineSettings::readSettingsFromProject( QgsProject *prj ) mMaxLineCandidatesPerCm = prj->readDoubleEntry( QStringLiteral( "PAL" ), QStringLiteral( "/CandidatesLinePerCM" ), 5, &saved ); mMaxPolygonCandidatesPerCmSquared = prj->readDoubleEntry( QStringLiteral( "PAL" ), QStringLiteral( "/CandidatesPolygonPerCM" ), 2.5, &saved ); - mFlags = nullptr; + mFlags = Flags(); if ( prj->readBoolEntry( QStringLiteral( "PAL" ), QStringLiteral( "/ShowingCandidates" ), false, &saved ) ) mFlags |= DrawCandidates; if ( prj->readBoolEntry( QStringLiteral( "PAL" ), QStringLiteral( "/DrawRectOnly" ), false, &saved ) ) mFlags |= DrawLabelRectOnly; if ( prj->readBoolEntry( QStringLiteral( "PAL" ), QStringLiteral( "/ShowingAllLabels" ), false, &saved ) ) mFlags |= UseAllLabels; diff --git a/src/core/layout/qgslayoutexporter.cpp b/src/core/layout/qgslayoutexporter.cpp index 34b73d023bdb..741644143f85 100644 --- a/src/core/layout/qgslayoutexporter.cpp +++ b/src/core/layout/qgslayoutexporter.cpp @@ -342,7 +342,7 @@ class LayoutContextSettingsRestorer private: QgsLayout *mLayout = nullptr; double mPreviousDpi = 0; - QgsLayoutRenderContext::Flags mPreviousFlags = nullptr; + QgsLayoutRenderContext::Flags mPreviousFlags = QgsLayoutRenderContext::Flags(); QgsRenderContext::TextRenderFormat mPreviousTextFormat = QgsRenderContext::TextFormatAlwaysOutlines; int mPreviousExportLayer = 0; QgsVectorSimplifyMethod mPreviousSimplifyMethod; diff --git a/src/core/layout/qgslayoutitem.cpp b/src/core/layout/qgslayoutitem.cpp index ce9a7e7196c8..49f96a22ee5a 100644 --- a/src/core/layout/qgslayoutitem.cpp +++ b/src/core/layout/qgslayoutitem.cpp @@ -128,7 +128,7 @@ int QgsLayoutItem::type() const QgsLayoutItem::Flags QgsLayoutItem::itemFlags() const { - return nullptr; + return QgsLayoutItem::Flags(); } void QgsLayoutItem::setId( const QString &id ) diff --git a/src/core/layout/qgslayoutitemmap.cpp b/src/core/layout/qgslayoutitemmap.cpp index db553adc6fbe..80ebd691328b 100644 --- a/src/core/layout/qgslayoutitemmap.cpp +++ b/src/core/layout/qgslayoutitemmap.cpp @@ -2722,7 +2722,7 @@ void QgsLayoutItemMap::createStagedRenderJob( const QgsRectangle &extent, const mStagedRendererJob = qgis::make_unique< QgsMapRendererStagedRenderJob >( settings, mLayout && mLayout->renderContext().flags() & QgsLayoutRenderContext::FlagRenderLabelsByMapLayer ? QgsMapRendererStagedRenderJob::RenderLabelsByMapLayer - : QgsMapRendererStagedRenderJob::Flags( nullptr ) ); + : QgsMapRendererStagedRenderJob::Flags() ); mStagedRendererJob->start(); } diff --git a/src/core/layout/qgslayoutitemmap.h b/src/core/layout/qgslayoutitemmap.h index 11efac24e9ca..5cf437ad7a38 100644 --- a/src/core/layout/qgslayoutitemmap.h +++ b/src/core/layout/qgslayoutitemmap.h @@ -939,7 +939,7 @@ class CORE_EXPORT QgsLayoutItemMap : public QgsLayoutItem, public QgsTemporalRan void updateAtlasFeature(); private: - QgsLayoutItemMap::MapItemFlags mMapFlags = nullptr; + QgsLayoutItemMap::MapItemFlags mMapFlags = QgsLayoutItemMap::MapItemFlags(); //! Unique identifier int mMapId = 1; diff --git a/src/core/layout/qgslayoutitemmapgrid.cpp b/src/core/layout/qgslayoutitemmapgrid.cpp index faf5e2d677f4..7b86f7191d82 100644 --- a/src/core/layout/qgslayoutitemmapgrid.cpp +++ b/src/core/layout/qgslayoutitemmapgrid.cpp @@ -1465,7 +1465,7 @@ QString QgsLayoutItemMapGrid::gridAnnotationString( double value, QgsLayoutItemM case DegreeMinuteNoSuffix: format = QgsCoordinateFormatter::FormatDegreesMinutes; - flags = nullptr; + flags = QgsCoordinateFormatter::FormatFlags(); break; case DegreeMinutePadded: @@ -1475,7 +1475,7 @@ QString QgsLayoutItemMapGrid::gridAnnotationString( double value, QgsLayoutItemM case DegreeMinuteSecondNoSuffix: format = QgsCoordinateFormatter::FormatDegreesMinutesSeconds; - flags = nullptr; + flags = QgsCoordinateFormatter::FormatFlags(); break; case DegreeMinuteSecondPadded: diff --git a/src/core/layout/qgslayoutmodel.h b/src/core/layout/qgslayoutmodel.h index 77b5fefe7a0c..892e29ea990f 100644 --- a/src/core/layout/qgslayoutmodel.h +++ b/src/core/layout/qgslayoutmodel.h @@ -401,7 +401,7 @@ class CORE_EXPORT QgsLayoutProxyModel: public QSortFilterProxyModel QgsLayoutItemRegistry::ItemType mItemTypeFilter; QList< QgsLayoutItem * > mExceptedList; bool mAllowEmpty = false; - QgsLayoutItem::Flags mItemFlags = nullptr; + QgsLayoutItem::Flags mItemFlags = QgsLayoutItem::Flags(); }; diff --git a/src/core/locator/qgslocatorfilter.cpp b/src/core/locator/qgslocatorfilter.cpp index 9759af93117e..c33a3b7ed5a0 100644 --- a/src/core/locator/qgslocatorfilter.cpp +++ b/src/core/locator/qgslocatorfilter.cpp @@ -30,7 +30,7 @@ QgsLocatorFilter::QgsLocatorFilter( QObject *parent ) QgsLocatorFilter::Flags QgsLocatorFilter::flags() const { - return nullptr; + return QgsLocatorFilter::Flags(); } void QgsLocatorFilter::triggerResultFromAction( const QgsLocatorResult &result, const int actionId ) diff --git a/src/core/processing/qgsprocessingalgorithm.cpp b/src/core/processing/qgsprocessingalgorithm.cpp index 5a01889483e8..7c8575c3e4d5 100644 --- a/src/core/processing/qgsprocessingalgorithm.cpp +++ b/src/core/processing/qgsprocessingalgorithm.cpp @@ -938,7 +938,7 @@ QgsProcessingFeatureSource::Flag QgsProcessingFeatureBasedAlgorithm::sourceFlags QgsFeatureSink::SinkFlags QgsProcessingFeatureBasedAlgorithm::sinkFlags() const { - return nullptr; + return QgsFeatureSink::SinkFlags(); } QgsWkbTypes::Type QgsProcessingFeatureBasedAlgorithm::outputWkbType( QgsWkbTypes::Type inputWkbType ) const diff --git a/src/core/processing/qgsprocessingprovider.cpp b/src/core/processing/qgsprocessingprovider.cpp index e7fea3863b8b..9a47efe8a38a 100644 --- a/src/core/processing/qgsprocessingprovider.cpp +++ b/src/core/processing/qgsprocessingprovider.cpp @@ -43,7 +43,7 @@ QString QgsProcessingProvider::svgIconPath() const QgsProcessingProvider::Flags QgsProcessingProvider::flags() const { - return nullptr; + return QgsProcessingProvider::Flags(); } QString QgsProcessingProvider::helpId() const diff --git a/src/core/providers/ogr/qgsgeopackageproviderconnection.h b/src/core/providers/ogr/qgsgeopackageproviderconnection.h index 6c667e0cce2b..dfda6783df3f 100644 --- a/src/core/providers/ogr/qgsgeopackageproviderconnection.h +++ b/src/core/providers/ogr/qgsgeopackageproviderconnection.h @@ -44,7 +44,7 @@ class QgsGeoPackageProviderConnection : public QgsAbstractDatabaseProviderConnec bool spatialIndexExists( const QString &schema, const QString &name, const QString &geometryColumn ) const override; void deleteSpatialIndex( const QString &schema, const QString &name, const QString &geometryColumn ) const override; QList tables( const QString &schema = QString(), - const TableFlags &flags = nullptr ) const override; + const TableFlags &flags = TableFlags() ) const override; QIcon icon() const override; QList nativeTypes() const override; diff --git a/src/core/providers/ogr/qgsogrprovider.cpp b/src/core/providers/ogr/qgsogrprovider.cpp index 042dc446f1a9..a7a3ad09b801 100644 --- a/src/core/providers/ogr/qgsogrprovider.cpp +++ b/src/core/providers/ogr/qgsogrprovider.cpp @@ -422,7 +422,7 @@ QgsVectorLayerExporter::ExportError QgsOgrProvider::createEmptyLayer( const QStr saveOptions.layerOptions = layerOptions; saveOptions.actionOnExistingFile = action; saveOptions.symbologyExport = QgsVectorFileWriter::NoSymbology; - std::unique_ptr< QgsVectorFileWriter > writer( QgsVectorFileWriter::create( uri, fields, wkbType, srs, QgsCoordinateTransformContext(), saveOptions, nullptr, nullptr, &newLayerName ) ); + std::unique_ptr< QgsVectorFileWriter > writer( QgsVectorFileWriter::create( uri, fields, wkbType, srs, QgsCoordinateTransformContext(), saveOptions, QgsFeatureSink::SinkFlags(), nullptr, &newLayerName ) ); layerName = newLayerName; QgsVectorFileWriter::WriterError error = writer->hasError(); @@ -2719,7 +2719,7 @@ QgsVectorDataProvider::Capabilities QgsOgrProvider::capabilities() const void QgsOgrProvider::computeCapabilities() { - QgsVectorDataProvider::Capabilities ability = nullptr; + QgsVectorDataProvider::Capabilities ability = QgsVectorDataProvider::Capabilities(); bool updateModeActivated = false; // collect abilities reported by OGR diff --git a/src/core/providers/ogr/qgsogrprovider.h b/src/core/providers/ogr/qgsogrprovider.h index 675666859558..51611a8b2724 100644 --- a/src/core/providers/ogr/qgsogrprovider.h +++ b/src/core/providers/ogr/qgsogrprovider.h @@ -319,7 +319,7 @@ class QgsOgrProvider final: public QgsVectorDataProvider void computeCapabilities(); - QgsVectorDataProvider::Capabilities mCapabilities = nullptr; + QgsVectorDataProvider::Capabilities mCapabilities = QgsVectorDataProvider::Capabilities(); bool doInitialActionsForEdition(); diff --git a/src/core/qgsabstractdatabaseproviderconnection.h b/src/core/qgsabstractdatabaseproviderconnection.h index 2cdb1f79658f..dc3f41830897 100644 --- a/src/core/qgsabstractdatabaseproviderconnection.h +++ b/src/core/qgsabstractdatabaseproviderconnection.h @@ -517,7 +517,7 @@ class CORE_EXPORT QgsAbstractDatabaseProviderConnection : public QgsAbstractProv * \throws QgsProviderConnectionException * \note Not available in Python bindings */ - virtual QList tables( const QString &schema = QString(), const QgsAbstractDatabaseProviderConnection::TableFlags &flags = nullptr ) const SIP_SKIP; + virtual QList tables( const QString &schema = QString(), const QgsAbstractDatabaseProviderConnection::TableFlags &flags = QgsAbstractDatabaseProviderConnection::TableFlags() ) const SIP_SKIP; /** * Returns information on a \a table in the given \a schema. @@ -581,8 +581,8 @@ class CORE_EXPORT QgsAbstractDatabaseProviderConnection : public QgsAbstractProv void checkCapability( Capability capability ) const; ///@endcond - Capabilities mCapabilities = nullptr SIP_SKIP; - GeometryColumnCapabilities mGeometryColumnCapabilities = nullptr SIP_SKIP; + Capabilities mCapabilities = Capabilities() SIP_SKIP; + GeometryColumnCapabilities mGeometryColumnCapabilities = GeometryColumnCapabilities() SIP_SKIP; QString mProviderKey; }; diff --git a/src/core/qgsbookmarkmodel.cpp b/src/core/qgsbookmarkmodel.cpp index 59a465bf434e..4b390dbd225b 100644 --- a/src/core/qgsbookmarkmodel.cpp +++ b/src/core/qgsbookmarkmodel.cpp @@ -107,7 +107,7 @@ QVariant QgsBookmarkManagerModel::data( const QModelIndex &index, int role ) con Qt::ItemFlags QgsBookmarkManagerModel::flags( const QModelIndex &index ) const { if ( !index.isValid() || index.row() < 0 || index.row() >= rowCount() ) - return nullptr; + return Qt::ItemFlags(); Qt::ItemFlags flags = Qt::ItemIsSelectable | Qt::ItemIsEnabled; if ( index.column() == ColumnStore ) diff --git a/src/core/qgsfeaturerequest.cpp b/src/core/qgsfeaturerequest.cpp index b8d060d64d55..c3ed3d6294d1 100644 --- a/src/core/qgsfeaturerequest.cpp +++ b/src/core/qgsfeaturerequest.cpp @@ -23,28 +23,24 @@ const QString QgsFeatureRequest::ALL_ATTRIBUTES = QStringLiteral( "#!allattributes!#" ); QgsFeatureRequest::QgsFeatureRequest() - : mFlags( nullptr ) { } QgsFeatureRequest::QgsFeatureRequest( QgsFeatureId fid ) : mFilter( FilterFid ) , mFilterFid( fid ) - , mFlags( nullptr ) { } QgsFeatureRequest::QgsFeatureRequest( const QgsFeatureIds &fids ) : mFilter( FilterFids ) , mFilterFids( fids ) - , mFlags( nullptr ) { } QgsFeatureRequest::QgsFeatureRequest( const QgsRectangle &rect ) : mFilterRect( rect ) - , mFlags( nullptr ) { } @@ -52,7 +48,6 @@ QgsFeatureRequest::QgsFeatureRequest( const QgsExpression &expr, const QgsExpres : mFilter( FilterExpression ) , mFilterExpression( new QgsExpression( expr ) ) , mExpressionContext( context ) - , mFlags( nullptr ) { } diff --git a/src/core/qgsfeaturerequest.h b/src/core/qgsfeaturerequest.h index 31c1a9550ace..4c9fa2814ae4 100644 --- a/src/core/qgsfeaturerequest.h +++ b/src/core/qgsfeaturerequest.h @@ -714,7 +714,7 @@ class CORE_EXPORT QgsFeatureRequest QgsFeatureIds mFilterFids; std::unique_ptr< QgsExpression > mFilterExpression; QgsExpressionContext mExpressionContext; - Flags mFlags; + Flags mFlags = Flags(); QgsAttributeList mAttrs; QgsSimplifyMethod mSimplifyMethod; long mLimit = -1; diff --git a/src/core/qgsmaplayermodel.cpp b/src/core/qgsmaplayermodel.cpp index 1d6e5bacc1c0..b257b16da359 100644 --- a/src/core/qgsmaplayermodel.cpp +++ b/src/core/qgsmaplayermodel.cpp @@ -367,7 +367,7 @@ Qt::ItemFlags QgsMapLayerModel::flags( const QModelIndex &index ) const if ( mCanReorder ) return Qt::ItemIsDropEnabled; else - return nullptr; + return Qt::ItemFlags(); } bool isEmpty = index.row() == 0 && mAllowEmpty; diff --git a/src/core/qgspaintenginehack.cpp b/src/core/qgspaintenginehack.cpp index 257972ee1203..72b6d79cc9a6 100644 --- a/src/core/qgspaintenginehack.cpp +++ b/src/core/qgspaintenginehack.cpp @@ -20,7 +20,7 @@ // Hack to workaround Qt #5114 by disabling PatternTransform void QgsPaintEngineHack::fixFlags() { - gccaps = nullptr; + gccaps = PaintEngineFeatures(); gccaps |= ( QPaintEngine::PrimitiveTransform // | QPaintEngine::PatternTransform | QPaintEngine::PixmapTransform diff --git a/src/core/qgsspatialindex.cpp b/src/core/qgsspatialindex.cpp index 2746c54b47be..2f3ed61d2da4 100644 --- a/src/core/qgsspatialindex.cpp +++ b/src/core/qgsspatialindex.cpp @@ -232,7 +232,7 @@ class QgsFeatureIteratorDataStream : public IDataStream QgsFeatureIterator mFi; RTree::Data *mNextData = nullptr; QgsFeedback *mFeedback = nullptr; - QgsSpatialIndex::Flags mFlags = nullptr; + QgsSpatialIndex::Flags mFlags = QgsSpatialIndex::Flags(); const std::function< bool( const QgsFeature & ) > *mCallback = nullptr; }; @@ -253,7 +253,7 @@ class QgsSpatialIndexData : public QSharedData initTree(); } - QgsSpatialIndex::Flags mFlags = nullptr; + QgsSpatialIndex::Flags mFlags = QgsSpatialIndex::Flags(); QHash< QgsFeatureId, QgsGeometry > mGeometries; diff --git a/src/core/qgsvectordataprovider.cpp b/src/core/qgsvectordataprovider.cpp index 3d7ad5070231..0c28359dec54 100644 --- a/src/core/qgsvectordataprovider.cpp +++ b/src/core/qgsvectordataprovider.cpp @@ -155,7 +155,7 @@ QgsFieldConstraints::Constraints QgsVectorDataProvider::fieldConstraints( int fi { QgsFields f = fields(); if ( fieldIndex < 0 || fieldIndex >= f.count() ) - return nullptr; + return QgsFieldConstraints::Constraints(); return f.at( fieldIndex ).constraints().constraints(); } diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp index b1c0c38aa38f..3acc0db91079 100644 --- a/src/core/qgsvectorfilewriter.cpp +++ b/src/core/qgsvectorfilewriter.cpp @@ -3021,7 +3021,7 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::writeAsVectorFormatV2( Pre } } - std::unique_ptr< QgsVectorFileWriter > writer( create( fileName, details.outputFields, destWkbType, details.outputCrs, transformContext, options, nullptr, newFilename, newLayer ) ); + std::unique_ptr< QgsVectorFileWriter > writer( create( fileName, details.outputFields, destWkbType, details.outputCrs, transformContext, options, QgsFeatureSink::SinkFlags(), newFilename, newLayer ) ); writer->setSymbologyScale( options.symbologyScale ); if ( newFilename ) @@ -3856,9 +3856,9 @@ QgsVectorFileWriter::EditionCapabilities QgsVectorFileWriter::editionCapabilitie OGRSFDriverH hDriver = nullptr; gdal::ogr_datasource_unique_ptr hDS( myOGROpen( datasetName.toUtf8().constData(), TRUE, &hDriver ) ); if ( !hDS ) - return nullptr; + return QgsVectorFileWriter::EditionCapabilities(); QString drvName = OGR_Dr_GetName( hDriver ); - QgsVectorFileWriter::EditionCapabilities caps = nullptr; + QgsVectorFileWriter::EditionCapabilities caps = QgsVectorFileWriter::EditionCapabilities(); if ( OGR_DS_TestCapability( hDS.get(), ODsCCreateLayer ) ) { // Shapefile driver returns True for a "foo.shp" dataset name, diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp index c118b9fc1524..9ca3c3a42cfc 100644 --- a/src/core/qgsvectorlayer.cpp +++ b/src/core/qgsvectorlayer.cpp @@ -5402,7 +5402,7 @@ bool QgsVectorLayer::setDependencies( const QSet &oDeps ) QgsFieldConstraints::Constraints QgsVectorLayer::fieldConstraints( int fieldIndex ) const { if ( fieldIndex < 0 || fieldIndex >= mFields.count() || !mDataProvider ) - return nullptr; + return QgsFieldConstraints::Constraints(); QgsFieldConstraints::Constraints constraints = mFields.at( fieldIndex ).constraints().constraints(); @@ -5444,7 +5444,7 @@ void QgsVectorLayer::setFieldConstraint( int index, QgsFieldConstraints::Constra QString name = mFields.at( index ).name(); // add constraint to existing constraints - QgsFieldConstraints::Constraints constraints = mFieldConstraints.value( name, nullptr ); + QgsFieldConstraints::Constraints constraints = mFieldConstraints.value( name, QgsFieldConstraints::Constraints() ); constraints |= constraint; mFieldConstraints.insert( name, constraints ); @@ -5461,7 +5461,7 @@ void QgsVectorLayer::removeFieldConstraint( int index, QgsFieldConstraints::Cons QString name = mFields.at( index ).name(); // remove constraint from existing constraints - QgsFieldConstraints::Constraints constraints = mFieldConstraints.value( name, nullptr ); + QgsFieldConstraints::Constraints constraints = mFieldConstraints.value( name, QgsFieldConstraints::Constraints() ); constraints &= ~constraint; mFieldConstraints.insert( name, constraints ); diff --git a/src/core/qgsvectorlayercache.cpp b/src/core/qgsvectorlayercache.cpp index 2d1ddad09e36..d35f208bce78 100644 --- a/src/core/qgsvectorlayercache.cpp +++ b/src/core/qgsvectorlayercache.cpp @@ -161,7 +161,7 @@ bool QgsVectorLayerCache::featureAtId( QgsFeatureId featureId, QgsFeature &featu else if ( mLayer->getFeatures( QgsFeatureRequest() .setFilterFid( featureId ) .setSubsetOfAttributes( mCachedAttributes ) - .setFlags( !mCacheGeometry ? QgsFeatureRequest::NoGeometry : QgsFeatureRequest::Flags( nullptr ) ) ) + .setFlags( !mCacheGeometry ? QgsFeatureRequest::NoGeometry : QgsFeatureRequest::Flags() ) ) .nextFeature( feature ) ) { cacheFeature( feature ); diff --git a/src/core/qgsvectorlayertemporalproperties.cpp b/src/core/qgsvectorlayertemporalproperties.cpp index f65b3465db1c..4019a805dcea 100644 --- a/src/core/qgsvectorlayertemporalproperties.cpp +++ b/src/core/qgsvectorlayertemporalproperties.cpp @@ -214,7 +214,7 @@ void QgsVectorLayerTemporalProperties::setMode( QgsVectorLayerTemporalProperties QgsTemporalProperty::Flags QgsVectorLayerTemporalProperties::flags() const { - return mode() == ModeFixedTemporalRange ? QgsTemporalProperty::FlagDontInvalidateCachedRendersWhenRangeChanges : QgsTemporalProperty::Flags( nullptr ); + return mode() == ModeFixedTemporalRange ? QgsTemporalProperty::FlagDontInvalidateCachedRendersWhenRangeChanges : QgsTemporalProperty::Flags(); } void QgsVectorLayerTemporalProperties::setFixedTemporalRange( const QgsDateTimeRange &range ) diff --git a/src/core/raster/qgscolorrampshader.cpp b/src/core/raster/qgscolorrampshader.cpp index aaf2f8060e14..7de80967dae0 100644 --- a/src/core/raster/qgscolorrampshader.cpp +++ b/src/core/raster/qgscolorrampshader.cpp @@ -469,6 +469,7 @@ bool QgsColorRampShader::shade( double value, int *returnRedValue, int *returnGr } } } + return false; } bool QgsColorRampShader::shade( double redValue, double greenValue, diff --git a/src/core/raster/qgsrasterlayertemporalproperties.cpp b/src/core/raster/qgsrasterlayertemporalproperties.cpp index 848fe0156c74..2b4b5b9bc756 100644 --- a/src/core/raster/qgsrasterlayertemporalproperties.cpp +++ b/src/core/raster/qgsrasterlayertemporalproperties.cpp @@ -72,7 +72,7 @@ void QgsRasterLayerTemporalProperties::setMode( QgsRasterLayerTemporalProperties QgsTemporalProperty::Flags QgsRasterLayerTemporalProperties::flags() const { - return mode() == ModeFixedTemporalRange ? QgsTemporalProperty::FlagDontInvalidateCachedRendersWhenRangeChanges : QgsTemporalProperty::Flags( nullptr ); + return mode() == ModeFixedTemporalRange ? QgsTemporalProperty::FlagDontInvalidateCachedRendersWhenRangeChanges : QgsTemporalProperty::Flags(); } QgsRasterDataProviderTemporalCapabilities::IntervalHandlingMethod QgsRasterLayerTemporalProperties::intervalHandlingMethod() const diff --git a/src/core/scalebar/qgsscalebarrenderer.cpp b/src/core/scalebar/qgsscalebarrenderer.cpp index 062c365bef4b..6470b5ff8a0a 100644 --- a/src/core/scalebar/qgsscalebarrenderer.cpp +++ b/src/core/scalebar/qgsscalebarrenderer.cpp @@ -155,7 +155,7 @@ void QgsScaleBarRenderer::drawDefaultLabels( QgsRenderContext &context, const Qg QgsScaleBarRenderer::Flags QgsScaleBarRenderer::flags() const { - return nullptr; + return QgsScaleBarRenderer::Flags(); } int QgsScaleBarRenderer::sortKey() const diff --git a/src/core/symbology/qgsinvertedpolygonrenderer.cpp b/src/core/symbology/qgsinvertedpolygonrenderer.cpp index 0505343b231b..9f3e139e8487 100644 --- a/src/core/symbology/qgsinvertedpolygonrenderer.cpp +++ b/src/core/symbology/qgsinvertedpolygonrenderer.cpp @@ -485,7 +485,7 @@ QgsFeatureRenderer::Capabilities QgsInvertedPolygonRenderer::capabilities() { if ( !mSubRenderer ) { - return nullptr; + return Capabilities(); } return mSubRenderer->capabilities(); } diff --git a/src/core/symbology/qgslinesymbollayer.cpp b/src/core/symbology/qgslinesymbollayer.cpp index 6a3e65280ab3..7f96270e97f7 100644 --- a/src/core/symbology/qgslinesymbollayer.cpp +++ b/src/core/symbology/qgslinesymbollayer.cpp @@ -2133,7 +2133,7 @@ void QgsMarkerLineSymbolLayer::startRender( QgsSymbolRenderContext &context ) mMarker->setOpacity( context.opacity() ); // if being rotated, it gets initialized with every line segment - QgsSymbol::RenderHints hints = nullptr; + QgsSymbol::RenderHints hints = QgsSymbol::RenderHints(); if ( rotateSymbols() ) hints |= QgsSymbol::DynamicRotation; mMarker->setRenderHints( hints ); @@ -2440,7 +2440,7 @@ void QgsHashedLineSymbolLayer::startRender( QgsSymbolRenderContext &context ) mHashSymbol->setOpacity( context.opacity() ); // if being rotated, it gets initialized with every line segment - QgsSymbol::RenderHints hints = nullptr; + QgsSymbol::RenderHints hints = QgsSymbol::RenderHints(); if ( rotateSymbols() ) hints |= QgsSymbol::DynamicRotation; mHashSymbol->setRenderHints( hints ); diff --git a/src/core/symbology/qgspointdistancerenderer.cpp b/src/core/symbology/qgspointdistancerenderer.cpp index abd950b8ce6c..19b12d1b1c02 100644 --- a/src/core/symbology/qgspointdistancerenderer.cpp +++ b/src/core/symbology/qgspointdistancerenderer.cpp @@ -238,7 +238,7 @@ QgsFeatureRenderer::Capabilities QgsPointDistanceRenderer::capabilities() { if ( !mRenderer ) { - return nullptr; + return Capabilities(); } return mRenderer->capabilities(); } diff --git a/src/core/symbology/qgssymbol.h b/src/core/symbology/qgssymbol.h index c124d0a36a09..e6eb6a2c3631 100644 --- a/src/core/symbology/qgssymbol.h +++ b/src/core/symbology/qgssymbol.h @@ -695,7 +695,7 @@ class CORE_EXPORT QgsSymbolRenderContext * \param fields * \param mapUnitScale */ - QgsSymbolRenderContext( QgsRenderContext &c, QgsUnitTypes::RenderUnit u, qreal opacity = 1.0, bool selected = false, QgsSymbol::RenderHints renderHints = nullptr, const QgsFeature *f = nullptr, const QgsFields &fields = QgsFields(), const QgsMapUnitScale &mapUnitScale = QgsMapUnitScale() ); + QgsSymbolRenderContext( QgsRenderContext &c, QgsUnitTypes::RenderUnit u, qreal opacity = 1.0, bool selected = false, QgsSymbol::RenderHints renderHints = QgsSymbol::RenderHints(), const QgsFeature *f = nullptr, const QgsFields &fields = QgsFields(), const QgsMapUnitScale &mapUnitScale = QgsMapUnitScale() ); ~QgsSymbolRenderContext(); diff --git a/src/core/symbology/qgssymbollayerutils.cpp b/src/core/symbology/qgssymbollayerutils.cpp index 5f3980bef13a..8e9619a4255e 100644 --- a/src/core/symbology/qgssymbollayerutils.cpp +++ b/src/core/symbology/qgssymbollayerutils.cpp @@ -841,7 +841,7 @@ QPicture QgsSymbolLayerUtils::symbolLayerPreviewPicture( const QgsSymbolLayer *l QgsRenderContext renderContext = QgsRenderContext::fromQPainter( &painter ); renderContext.setForceVectorOutput( true ); renderContext.setFlag( QgsRenderContext::RenderSymbolPreview, true ); - QgsSymbolRenderContext symbolContext( renderContext, units, 1.0, false, nullptr, nullptr ); + QgsSymbolRenderContext symbolContext( renderContext, units, 1.0, false, QgsSymbol::RenderHints(), nullptr ); std::unique_ptr< QgsSymbolLayer > layerClone( layer->clone() ); layerClone->drawPreviewIcon( symbolContext, size ); painter.end(); @@ -862,7 +862,7 @@ QIcon QgsSymbolLayerUtils::symbolLayerPreviewIcon( const QgsSymbolLayer *layer, expContext.appendScopes( QgsExpressionContextUtils::globalProjectLayerScopes( nullptr ) ); renderContext.setExpressionContext( expContext ); - QgsSymbolRenderContext symbolContext( renderContext, u, 1.0, false, nullptr, nullptr ); + QgsSymbolRenderContext symbolContext( renderContext, u, 1.0, false, QgsSymbol::RenderHints(), nullptr ); std::unique_ptr< QgsSymbolLayer > layerClone( layer->clone() ); layerClone->drawPreviewIcon( symbolContext, size ); painter.end(); diff --git a/src/gui/attributetable/qgsfeaturefilterwidget.cpp b/src/gui/attributetable/qgsfeaturefilterwidget.cpp index e10f807cad2d..23e97d06d7c2 100644 --- a/src/gui/attributetable/qgsfeaturefilterwidget.cpp +++ b/src/gui/attributetable/qgsfeaturefilterwidget.cpp @@ -336,7 +336,7 @@ void QgsFeatureFilterWidget::filterExpressionBuilder() void QgsFeatureFilterWidget::saveAsStoredFilterExpression() { - QgsDialog *dlg = new QgsDialog( this, nullptr, QDialogButtonBox::Save | QDialogButtonBox::Cancel ); + QgsDialog *dlg = new QgsDialog( this, Qt::WindowFlags(), QDialogButtonBox::Save | QDialogButtonBox::Cancel ); dlg->setWindowTitle( tr( "Save Expression As" ) ); QVBoxLayout *layout = dlg->layout(); dlg->resize( std::max( 400, this->width() / 2 ), dlg->height() ); @@ -358,7 +358,7 @@ void QgsFeatureFilterWidget::saveAsStoredFilterExpression() void QgsFeatureFilterWidget::editStoredFilterExpression() { - QgsDialog *dlg = new QgsDialog( this, nullptr, QDialogButtonBox::Save | QDialogButtonBox::Cancel ); + QgsDialog *dlg = new QgsDialog( this, Qt::WindowFlags(), QDialogButtonBox::Save | QDialogButtonBox::Cancel ); dlg->setWindowTitle( tr( "Edit expression" ) ); QVBoxLayout *layout = dlg->layout(); dlg->resize( std::max( 400, this->width() / 2 ), dlg->height() ); @@ -472,7 +472,7 @@ void QgsFeatureFilterWidget::replaceSearchWidget( QWidget *oldw, QWidget *neww ) { mFilterLayout->removeWidget( oldw ); oldw->setVisible( false ); - mFilterLayout->addWidget( neww, 0, 0, nullptr ); + mFilterLayout->addWidget( neww, 0, 0 ); neww->setVisible( true ); neww->setFocus(); } diff --git a/src/gui/effects/qgseffectstackpropertieswidget.h b/src/gui/effects/qgseffectstackpropertieswidget.h index dd5aa1accffa..0e0ac72d8973 100644 --- a/src/gui/effects/qgseffectstackpropertieswidget.h +++ b/src/gui/effects/qgseffectstackpropertieswidget.h @@ -178,7 +178,7 @@ class GUI_EXPORT QgsEffectStackPropertiesDialog: public QgsDialog * \param parent parent widget * \param f window flags */ - QgsEffectStackPropertiesDialog( QgsEffectStack *stack, QWidget *parent SIP_TRANSFERTHIS = nullptr, Qt::WindowFlags f = nullptr ); + QgsEffectStackPropertiesDialog( QgsEffectStack *stack, QWidget *parent SIP_TRANSFERTHIS = nullptr, Qt::WindowFlags f = Qt::WindowFlags() ); /** * Returns effect stack attached to the dialog diff --git a/src/gui/labeling/qgslabelinggui.cpp b/src/gui/labeling/qgslabelinggui.cpp index 2685fe002961..635b9da8d8e9 100644 --- a/src/gui/labeling/qgslabelinggui.cpp +++ b/src/gui/labeling/qgslabelinggui.cpp @@ -521,7 +521,7 @@ QgsPalLayerSettings QgsLabelingGui::layerSettings() lyr.labelOffsetMapUnitScale = mPointOffsetUnitWidget->getMapUnitScale(); lyr.angleOffset = mPointAngleSpinBox->value(); - QgsLabeling::LinePlacementFlags linePlacementFlags = 0; + QgsLabeling::LinePlacementFlags linePlacementFlags = QgsLabeling::LinePlacementFlags(); if ( chkLineAbove->isChecked() ) linePlacementFlags |= QgsLabeling::LinePlacementFlag::AboveLine; if ( chkLineBelow->isChecked() ) diff --git a/src/gui/layout/qgsgeopdflayertreemodel.cpp b/src/gui/layout/qgsgeopdflayertreemodel.cpp index f8778dc1eefb..e8783ef0fe77 100644 --- a/src/gui/layout/qgsgeopdflayertreemodel.cpp +++ b/src/gui/layout/qgsgeopdflayertreemodel.cpp @@ -53,7 +53,7 @@ Qt::ItemFlags QgsGeoPdfLayerTreeModel::flags( const QModelIndex &idx ) const } if ( !mapLayer( idx ) ) - return nullptr; + return Qt::ItemFlags(); return Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsDragEnabled; } diff --git a/src/gui/layout/qgslayoutattributeselectiondialog.h b/src/gui/layout/qgslayoutattributeselectiondialog.h index 9adbf45fa2cc..c807ba269010 100644 --- a/src/gui/layout/qgslayoutattributeselectiondialog.h +++ b/src/gui/layout/qgslayoutattributeselectiondialog.h @@ -282,7 +282,7 @@ class GUI_EXPORT QgsLayoutAttributeSelectionDialog: public QDialog, private Ui:: Q_OBJECT public: //! constructor - QgsLayoutAttributeSelectionDialog( QgsLayoutItemAttributeTable *table, QgsVectorLayer *vLayer, QWidget *parent = nullptr, Qt::WindowFlags f = nullptr ); + QgsLayoutAttributeSelectionDialog( QgsLayoutItemAttributeTable *table, QgsVectorLayer *vLayer, QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags() ); private slots: void mRemoveColumnPushButton_clicked(); diff --git a/src/gui/layout/qgslayoutguiutils.cpp b/src/gui/layout/qgslayoutguiutils.cpp index 27e516577620..9d3cbdfa88ef 100644 --- a/src/gui/layout/qgslayoutguiutils.cpp +++ b/src/gui/layout/qgslayoutguiutils.cpp @@ -287,19 +287,19 @@ void QgsLayoutGuiUtils::registerGuiForKnownItemTypes( QgsMapCanvas *mapCanvas ) return new QgsLayoutShapeWidget( qobject_cast< QgsLayoutItemShape * >( item ) ); }; - registry->addLayoutItemGuiMetadata( new QgsLayoutItemGuiMetadata( QgsLayoutItemRegistry::LayoutShape, QObject::tr( "Rectangle" ), QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddBasicRectangle.svg" ) ), createShapeWidget, createRubberBand, QStringLiteral( "shapes" ), false, nullptr, []( QgsLayout * layout )->QgsLayoutItem* + registry->addLayoutItemGuiMetadata( new QgsLayoutItemGuiMetadata( QgsLayoutItemRegistry::LayoutShape, QObject::tr( "Rectangle" ), QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddBasicRectangle.svg" ) ), createShapeWidget, createRubberBand, QStringLiteral( "shapes" ), false, QgsLayoutItemAbstractGuiMetadata::Flags(), []( QgsLayout * layout )->QgsLayoutItem* { std::unique_ptr< QgsLayoutItemShape > shape = qgis::make_unique< QgsLayoutItemShape >( layout ); shape->setShapeType( QgsLayoutItemShape::Rectangle ); return shape.release(); } ) ); - registry->addLayoutItemGuiMetadata( new QgsLayoutItemGuiMetadata( QgsLayoutItemRegistry::LayoutShape, QObject::tr( "Ellipse" ), QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddBasicCircle.svg" ) ), createShapeWidget, createEllipseBand, QStringLiteral( "shapes" ), false, nullptr, []( QgsLayout * layout )->QgsLayoutItem* + registry->addLayoutItemGuiMetadata( new QgsLayoutItemGuiMetadata( QgsLayoutItemRegistry::LayoutShape, QObject::tr( "Ellipse" ), QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddBasicCircle.svg" ) ), createShapeWidget, createEllipseBand, QStringLiteral( "shapes" ), false, QgsLayoutItemAbstractGuiMetadata::Flags(), []( QgsLayout * layout )->QgsLayoutItem* { std::unique_ptr< QgsLayoutItemShape > shape = qgis::make_unique< QgsLayoutItemShape >( layout ); shape->setShapeType( QgsLayoutItemShape::Ellipse ); return shape.release(); } ) ); - registry->addLayoutItemGuiMetadata( new QgsLayoutItemGuiMetadata( QgsLayoutItemRegistry::LayoutShape, QObject::tr( "Triangle" ), QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddBasicTriangle.svg" ) ), createShapeWidget, createTriangleBand, QStringLiteral( "shapes" ), false, nullptr, []( QgsLayout * layout )->QgsLayoutItem* + registry->addLayoutItemGuiMetadata( new QgsLayoutItemGuiMetadata( QgsLayoutItemRegistry::LayoutShape, QObject::tr( "Triangle" ), QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddBasicTriangle.svg" ) ), createShapeWidget, createTriangleBand, QStringLiteral( "shapes" ), false, QgsLayoutItemAbstractGuiMetadata::Flags(), []( QgsLayout * layout )->QgsLayoutItem* { std::unique_ptr< QgsLayoutItemShape > shape = qgis::make_unique< QgsLayoutItemShape >( layout ); shape->setShapeType( QgsLayoutItemShape::Triangle ); diff --git a/src/gui/layout/qgslayoutviewrubberband.h b/src/gui/layout/qgslayoutviewrubberband.h index cb05192e2e9d..bae0dd21c9f2 100644 --- a/src/gui/layout/qgslayoutviewrubberband.h +++ b/src/gui/layout/qgslayoutviewrubberband.h @@ -79,7 +79,7 @@ class GUI_EXPORT QgsLayoutViewRubberBand : public QObject * band is no longer required. * Returns the final bounding box of the rubber band. */ - virtual QRectF finish( QPointF position = QPointF(), Qt::KeyboardModifiers modifiers = nullptr ) = 0; + virtual QRectF finish( QPointF position = QPointF(), Qt::KeyboardModifiers modifiers = Qt::KeyboardModifiers() ) = 0; /** * Returns the view associated with the rubber band. @@ -172,7 +172,7 @@ class GUI_EXPORT QgsLayoutViewRectangularRubberBand : public QgsLayoutViewRubber void start( QPointF position, Qt::KeyboardModifiers modifiers ) override; void update( QPointF position, Qt::KeyboardModifiers modifiers ) override; - QRectF finish( QPointF position = QPointF(), Qt::KeyboardModifiers modifiers = nullptr ) override; + QRectF finish( QPointF position = QPointF(), Qt::KeyboardModifiers modifiers = Qt::KeyboardModifiers() ) override; private: @@ -205,7 +205,7 @@ class GUI_EXPORT QgsLayoutViewEllipticalRubberBand : public QgsLayoutViewRubberB void start( QPointF position, Qt::KeyboardModifiers modifiers ) override; void update( QPointF position, Qt::KeyboardModifiers modifiers ) override; - QRectF finish( QPointF position = QPointF(), Qt::KeyboardModifiers modifiers = nullptr ) override; + QRectF finish( QPointF position = QPointF(), Qt::KeyboardModifiers modifiers = Qt::KeyboardModifiers() ) override; private: @@ -238,7 +238,7 @@ class GUI_EXPORT QgsLayoutViewTriangleRubberBand : public QgsLayoutViewRubberBan void start( QPointF position, Qt::KeyboardModifiers modifiers ) override; void update( QPointF position, Qt::KeyboardModifiers modifiers ) override; - QRectF finish( QPointF position = QPointF(), Qt::KeyboardModifiers modifiers = nullptr ) override; + QRectF finish( QPointF position = QPointF(), Qt::KeyboardModifiers modifiers = Qt::KeyboardModifiers() ) override; private: diff --git a/src/gui/layout/qgslayoutviewtool.h b/src/gui/layout/qgslayoutviewtool.h index 9b8f86e8deeb..6bfe22b04cc5 100644 --- a/src/gui/layout/qgslayoutviewtool.h +++ b/src/gui/layout/qgslayoutviewtool.h @@ -217,7 +217,7 @@ class GUI_EXPORT QgsLayoutViewTool : public QObject //! Pointer to layout view. QgsLayoutView *mView = nullptr; - QgsLayoutViewTool::Flags mFlags = nullptr; + QgsLayoutViewTool::Flags mFlags = QgsLayoutViewTool::Flags(); //! Cursor used by tool QCursor mCursor = Qt::ArrowCursor; diff --git a/src/gui/layout/qgslayoutviewtoolselect.cpp b/src/gui/layout/qgslayoutviewtoolselect.cpp index ea14d421179f..9f86f211c351 100644 --- a/src/gui/layout/qgslayoutviewtoolselect.cpp +++ b/src/gui/layout/qgslayoutviewtoolselect.cpp @@ -119,7 +119,7 @@ void QgsLayoutViewToolSelect::layoutPressEvent( QgsLayoutViewMouseEvent *event ) //not clicking over an item, so start marquee selection mIsSelecting = true; mMousePressStartPos = event->pos(); - mRubberBand->start( event->layoutPoint(), nullptr ); + mRubberBand->start( event->layoutPoint(), Qt::KeyboardModifiers() ); return; } @@ -159,7 +159,7 @@ void QgsLayoutViewToolSelect::layoutMoveEvent( QgsLayoutViewMouseEvent *event ) { if ( mIsSelecting ) { - mRubberBand->update( event->layoutPoint(), nullptr ); + mRubberBand->update( event->layoutPoint(), Qt::KeyboardModifiers() ); } else { diff --git a/src/gui/layout/qgslayoutviewtoolzoom.cpp b/src/gui/layout/qgslayoutviewtoolzoom.cpp index d3cb55316ea9..afb94ca352df 100644 --- a/src/gui/layout/qgslayoutviewtoolzoom.cpp +++ b/src/gui/layout/qgslayoutviewtoolzoom.cpp @@ -69,7 +69,7 @@ void QgsLayoutViewToolZoom::layoutMoveEvent( QgsLayoutViewMouseEvent *event ) return; } - mRubberBand->update( event->layoutPoint(), nullptr ); + mRubberBand->update( event->layoutPoint(), Qt::KeyboardModifiers() ); } void QgsLayoutViewToolZoom::layoutReleaseEvent( QgsLayoutViewMouseEvent *event ) @@ -143,5 +143,5 @@ void QgsLayoutViewToolZoom::startMarqueeZoom( QPointF scenePoint ) mMarqueeZoom = true; mRubberBandStartPos = scenePoint; - mRubberBand->start( scenePoint, nullptr ); + mRubberBand->start( scenePoint, Qt::KeyboardModifiers() ); } diff --git a/src/gui/ogr/qgsvectorlayersaveasdialog.h b/src/gui/ogr/qgsvectorlayersaveasdialog.h index 1c119c8f55d5..da76cf90c48d 100644 --- a/src/gui/ogr/qgsvectorlayersaveasdialog.h +++ b/src/gui/ogr/qgsvectorlayersaveasdialog.h @@ -59,12 +59,12 @@ class GUI_EXPORT QgsVectorLayerSaveAsDialog : public QDialog, private Ui::QgsVec * * \deprecated since QGIS 3.14 - will be removed in QGIS 4.0 */ - Q_DECL_DEPRECATED QgsVectorLayerSaveAsDialog( long srsid, QWidget *parent = nullptr, Qt::WindowFlags fl = nullptr ); + Q_DECL_DEPRECATED QgsVectorLayerSaveAsDialog( long srsid, QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags() ); /** * Construct a new QgsVectorLayerSaveAsDialog */ - QgsVectorLayerSaveAsDialog( QgsVectorLayer *layer, int options = AllOptions, QWidget *parent = nullptr, Qt::WindowFlags fl = nullptr ); + QgsVectorLayerSaveAsDialog( QgsVectorLayer *layer, int options = AllOptions, QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags() ); /** * The format in which the export should be written. diff --git a/src/gui/processing/models/qgsmodelcomponentgraphicitem.cpp b/src/gui/processing/models/qgsmodelcomponentgraphicitem.cpp index f9a4ef951491..655e858f1ed6 100644 --- a/src/gui/processing/models/qgsmodelcomponentgraphicitem.cpp +++ b/src/gui/processing/models/qgsmodelcomponentgraphicitem.cpp @@ -72,7 +72,7 @@ QgsModelComponentGraphicItem::QgsModelComponentGraphicItem( QgsProcessingModelCo QgsModelComponentGraphicItem::Flags QgsModelComponentGraphicItem::flags() const { - return nullptr; + return QgsModelComponentGraphicItem::Flags(); } QgsModelComponentGraphicItem::~QgsModelComponentGraphicItem() = default; diff --git a/src/gui/processing/models/qgsmodelviewrubberband.h b/src/gui/processing/models/qgsmodelviewrubberband.h index 03465d852efd..3b671023f606 100644 --- a/src/gui/processing/models/qgsmodelviewrubberband.h +++ b/src/gui/processing/models/qgsmodelviewrubberband.h @@ -71,7 +71,7 @@ class GUI_EXPORT QgsModelViewRubberBand : public QObject * band is no longer required. * Returns the final bounding box of the rubber band. */ - virtual QRectF finish( QPointF position = QPointF(), Qt::KeyboardModifiers modifiers = nullptr ) = 0; + virtual QRectF finish( QPointF position = QPointF(), Qt::KeyboardModifiers modifiers = Qt::KeyboardModifiers() ) = 0; /** * Returns the view associated with the rubber band. @@ -157,7 +157,7 @@ class GUI_EXPORT QgsModelViewRectangularRubberBand : public QgsModelViewRubberBa void start( QPointF position, Qt::KeyboardModifiers modifiers ) override; void update( QPointF position, Qt::KeyboardModifiers modifiers ) override; - QRectF finish( QPointF position = QPointF(), Qt::KeyboardModifiers modifiers = nullptr ) override; + QRectF finish( QPointF position = QPointF(), Qt::KeyboardModifiers modifiers = Qt::KeyboardModifiers() ) override; private: diff --git a/src/gui/processing/models/qgsmodelviewtool.h b/src/gui/processing/models/qgsmodelviewtool.h index da5620313834..dfcd4e257b37 100644 --- a/src/gui/processing/models/qgsmodelviewtool.h +++ b/src/gui/processing/models/qgsmodelviewtool.h @@ -204,7 +204,7 @@ class GUI_EXPORT QgsModelViewTool : public QObject //! Pointer to model view. QgsModelGraphicsView *mView = nullptr; - QgsModelViewTool::Flags mFlags = nullptr; + QgsModelViewTool::Flags mFlags = QgsModelViewTool::Flags(); //! Cursor used by tool QCursor mCursor = Qt::ArrowCursor; diff --git a/src/gui/processing/models/qgsmodelviewtoolselect.cpp b/src/gui/processing/models/qgsmodelviewtoolselect.cpp index 63393826c3bc..63d2a2e6a222 100644 --- a/src/gui/processing/models/qgsmodelviewtoolselect.cpp +++ b/src/gui/processing/models/qgsmodelviewtoolselect.cpp @@ -85,7 +85,7 @@ void QgsModelViewToolSelect::modelPressEvent( QgsModelViewMouseEvent *event ) //not clicking over an item, so start marquee selection mIsSelecting = true; mMousePressStartPos = event->pos(); - mRubberBand->start( event->modelPoint(), nullptr ); + mRubberBand->start( event->modelPoint(), Qt::KeyboardModifiers() ); return; } @@ -147,7 +147,7 @@ void QgsModelViewToolSelect::modelMoveEvent( QgsModelViewMouseEvent *event ) { if ( mIsSelecting ) { - mRubberBand->update( event->modelPoint(), nullptr ); + mRubberBand->update( event->modelPoint(), Qt::KeyboardModifiers() ); } else { diff --git a/src/gui/processing/models/qgsmodelviewtoolzoom.cpp b/src/gui/processing/models/qgsmodelviewtoolzoom.cpp index e8cf19b62ef2..83f88777a1ae 100644 --- a/src/gui/processing/models/qgsmodelviewtoolzoom.cpp +++ b/src/gui/processing/models/qgsmodelviewtoolzoom.cpp @@ -68,7 +68,7 @@ void QgsModelViewToolZoom::modelMoveEvent( QgsModelViewMouseEvent *event ) return; } - mRubberBand->update( event->modelPoint(), nullptr ); + mRubberBand->update( event->modelPoint(), Qt::KeyboardModifiers() ); } void QgsModelViewToolZoom::modelReleaseEvent( QgsModelViewMouseEvent *event ) @@ -140,5 +140,5 @@ void QgsModelViewToolZoom::startMarqueeZoom( QPointF scenePoint ) mMarqueeZoom = true; mRubberBandStartPos = scenePoint; - mRubberBand->start( scenePoint, nullptr ); + mRubberBand->start( scenePoint, Qt::KeyboardModifiers() ); } diff --git a/src/gui/processing/qgsprocessingmaplayercombobox.cpp b/src/gui/processing/qgsprocessingmaplayercombobox.cpp index 916048bff61c..842046f692c6 100644 --- a/src/gui/processing/qgsprocessingmaplayercombobox.cpp +++ b/src/gui/processing/qgsprocessingmaplayercombobox.cpp @@ -111,7 +111,7 @@ QgsProcessingMapLayerComboBox::QgsProcessingMapLayerComboBox( const QgsProcessin vl->setSpacing( 6 ); vl->addLayout( layout ); - QgsMapLayerProxyModel::Filters filters = nullptr; + QgsMapLayerProxyModel::Filters filters = QgsMapLayerProxyModel::Filters(); if ( mParameter->type() == QgsProcessingParameterFeatureSource::typeName() && type == QgsProcessingGui::Standard ) { diff --git a/src/gui/processing/qgsprocessingoutputdestinationwidget.cpp b/src/gui/processing/qgsprocessingoutputdestinationwidget.cpp index 8184dcdbbfb4..1077ef47ab80 100644 --- a/src/gui/processing/qgsprocessingoutputdestinationwidget.cpp +++ b/src/gui/processing/qgsprocessingoutputdestinationwidget.cpp @@ -406,7 +406,7 @@ void QgsProcessingLayerOutputDestinationWidget::selectFile() const bool dontConfirmOverwrite = mParameter->metadata().value( QStringLiteral( "widget_wrapper" ) ).toMap().value( QStringLiteral( "dontconfirmoverwrite" ), false ).toBool(); - QString filename = QFileDialog::getSaveFileName( this, tr( "Save file" ), path, fileFilter, &lastFilter, dontConfirmOverwrite ? QFileDialog::Options( QFileDialog::DontConfirmOverwrite ) : nullptr ); + QString filename = QFileDialog::getSaveFileName( this, tr( "Save file" ), path, fileFilter, &lastFilter, dontConfirmOverwrite ? QFileDialog::Options( QFileDialog::DontConfirmOverwrite ) : QFileDialog::Options() ); if ( !filename.isEmpty() ) { mUseTemporary = false; diff --git a/src/gui/processing/qgsprocessingtoolboxmodel.cpp b/src/gui/processing/qgsprocessingtoolboxmodel.cpp index d2a74a0e8811..011870bd1de5 100644 --- a/src/gui/processing/qgsprocessingtoolboxmodel.cpp +++ b/src/gui/processing/qgsprocessingtoolboxmodel.cpp @@ -328,7 +328,7 @@ QString QgsProcessingToolboxModel::toolTipForAlgorithm( const QgsProcessingAlgor Qt::ItemFlags QgsProcessingToolboxModel::flags( const QModelIndex &index ) const { if ( !index.isValid() ) - return nullptr; + return Qt::ItemFlags(); return QAbstractItemModel::flags( index ); } diff --git a/src/gui/processing/qgsprocessingtoolboxmodel.h b/src/gui/processing/qgsprocessingtoolboxmodel.h index 0df0c4f98326..a1d1b9b7db8c 100644 --- a/src/gui/processing/qgsprocessingtoolboxmodel.h +++ b/src/gui/processing/qgsprocessingtoolboxmodel.h @@ -499,7 +499,7 @@ class GUI_EXPORT QgsProcessingToolboxProxyModel: public QSortFilterProxyModel private: QgsProcessingToolboxModel *mModel = nullptr; - Filters mFilters = nullptr; + Filters mFilters = Filters(); QString mFilterString; QPointer mInPlaceLayer; }; diff --git a/src/gui/processing/qgsprocessingwidgetwrapperimpl.cpp b/src/gui/processing/qgsprocessingwidgetwrapperimpl.cpp index bcd84f402114..dd27152db272 100644 --- a/src/gui/processing/qgsprocessingwidgetwrapperimpl.cpp +++ b/src/gui/processing/qgsprocessingwidgetwrapperimpl.cpp @@ -2196,7 +2196,7 @@ void QgsProcessingEnumPanelWidget::showDialog() } else { - QgsProcessingMultipleSelectionDialog dlg( availableOptions, mValue, this, nullptr ); + QgsProcessingMultipleSelectionDialog dlg( availableOptions, mValue, this, Qt::WindowFlags() ); dlg.setValueFormatter( [options]( const QVariant & v ) -> QString { @@ -3578,7 +3578,7 @@ QWidget *QgsProcessingCoordinateOperationWidgetWrapper::createWidget() button->setText( QString( QChar( 0x2026 ) ) ); connect( button, &QToolButton::clicked, this, [ = ] { - QgsDatumTransformDialog dlg( mSourceCrs, mDestCrs, false, false, false, qMakePair( -1, -1 ), button, nullptr, mLineEdit->text(), mCanvas ); + QgsDatumTransformDialog dlg( mSourceCrs, mDestCrs, false, false, false, qMakePair( -1, -1 ), button, Qt::WindowFlags(), mLineEdit->text(), mCanvas ); if ( dlg.exec() ) { mLineEdit->setText( dlg.selectedDatumTransform().proj ); @@ -3825,7 +3825,7 @@ void QgsProcessingFieldPanelWidget::showDialog() } else { - QgsProcessingMultipleSelectionDialog dlg( availableOptions, mValue, this, nullptr ); + QgsProcessingMultipleSelectionDialog dlg( availableOptions, mValue, this, Qt::WindowFlags() ); dlg.setValueFormatter( []( const QVariant & v ) -> QString { @@ -6008,7 +6008,7 @@ void QgsProcessingRasterBandPanelWidget::showDialog() } else { - QgsProcessingMultipleSelectionDialog dlg( availableOptions, mValue, this, nullptr ); + QgsProcessingMultipleSelectionDialog dlg( availableOptions, mValue, this, Qt::WindowFlags() ); dlg.setValueFormatter( [this]( const QVariant & v ) -> QString { @@ -6560,7 +6560,7 @@ void QgsProcessingMultipleLayerPanelWidget::showDialog() } else { - QgsProcessingMultipleInputDialog dlg( mParam, mValue, mModelSources, mModel, this, nullptr ); + QgsProcessingMultipleInputDialog dlg( mParam, mValue, mModelSources, mModel, this, Qt::WindowFlags() ); dlg.setProject( mProject ); if ( dlg.exec() ) { diff --git a/src/gui/providers/ogr/qgsogrsourceselect.h b/src/gui/providers/ogr/qgsogrsourceselect.h index 00e4c0843d6e..d33423090cc1 100644 --- a/src/gui/providers/ogr/qgsogrsourceselect.h +++ b/src/gui/providers/ogr/qgsogrsourceselect.h @@ -49,7 +49,7 @@ class QgsOgrSourceSelect : public QgsAbstractDataSourceWidget, private Ui::QgsOg Q_OBJECT public: - QgsOgrSourceSelect( QWidget *parent = nullptr, Qt::WindowFlags fl = nullptr, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::None ); + QgsOgrSourceSelect( QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags(), QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::None ); //! Opens a dialog to select a file datasource*/ QStringList openFile(); //! Opens a dialog to select a directory datasource*/ diff --git a/src/gui/qgsadvanceddigitizingdockwidget.cpp b/src/gui/qgsadvanceddigitizingdockwidget.cpp index 5466c38269ce..8e58302dfe2a 100644 --- a/src/gui/qgsadvanceddigitizingdockwidget.cpp +++ b/src/gui/qgsadvanceddigitizingdockwidget.cpp @@ -536,7 +536,7 @@ void QgsAdvancedDigitizingDockWidget::lockAdditionalConstraint( AdditionalConstr void QgsAdvancedDigitizingDockWidget::updateCapacity( bool updateUIwithoutChange ) { - CadCapacities newCapacities = nullptr; + CadCapacities newCapacities = CadCapacities(); // first point is the mouse point (it doesn't count) if ( mCadPointList.count() > 1 ) { diff --git a/src/gui/qgsadvanceddigitizingdockwidget.h b/src/gui/qgsadvanceddigitizingdockwidget.h index c14e9f062d3b..fef1c6b495b1 100644 --- a/src/gui/qgsadvanceddigitizingdockwidget.h +++ b/src/gui/qgsadvanceddigitizingdockwidget.h @@ -706,7 +706,7 @@ class GUI_EXPORT QgsAdvancedDigitizingDockWidget : public QgsDockWidget, private //! Snapping indicator std::unique_ptr mSnapIndicator; - CadCapacities mCapacities = nullptr; + CadCapacities mCapacities = CadCapacities(); bool mCurrentMapToolSupportsCad = false; diff --git a/src/gui/qgscolorbutton.cpp b/src/gui/qgscolorbutton.cpp index e87ab097327c..c1fd87503443 100644 --- a/src/gui/qgscolorbutton.cpp +++ b/src/gui/qgscolorbutton.cpp @@ -128,7 +128,7 @@ void QgsColorButton::showColorDialog() } else { - QgsColorDialog dialog( this, nullptr, color() ); + QgsColorDialog dialog( this, Qt::WindowFlags(), color() ); dialog.setTitle( mColorDialogTitle ); dialog.setAllowOpacity( mAllowOpacity ); diff --git a/src/gui/qgscolordialog.cpp b/src/gui/qgscolordialog.cpp index 5ed9acd1b855..70078a568313 100644 --- a/src/gui/qgscolordialog.cpp +++ b/src/gui/qgscolordialog.cpp @@ -92,7 +92,7 @@ QColor QgsColorDialog::getColor( const QColor &initialColor, QWidget *parent, co } else { - QgsColorDialog *dialog = new QgsColorDialog( parent, nullptr, initialColor ); + QgsColorDialog *dialog = new QgsColorDialog( parent, Qt::WindowFlags(), initialColor ); dialog->setWindowTitle( dialogTitle ); dialog->setAllowOpacity( allowOpacity ); diff --git a/src/gui/qgsdatumtransformdialog.cpp b/src/gui/qgsdatumtransformdialog.cpp index 95cad5ac6405..fb197d748f01 100644 --- a/src/gui/qgsdatumtransformdialog.cpp +++ b/src/gui/qgsdatumtransformdialog.cpp @@ -44,7 +44,7 @@ bool QgsDatumTransformDialog::run( const QgsCoordinateReferenceSystem &sourceCrs return true; } - QgsDatumTransformDialog dlg( sourceCrs, destinationCrs, false, true, false, qMakePair( -1, -1 ), parent, nullptr, QString(), mapCanvas ); + QgsDatumTransformDialog dlg( sourceCrs, destinationCrs, false, true, false, qMakePair( -1, -1 ), parent, Qt::WindowFlags(), QString(), mapCanvas ); if ( !windowTitle.isEmpty() ) dlg.setWindowTitle( windowTitle ); diff --git a/src/gui/qgsdatumtransformdialog.h b/src/gui/qgsdatumtransformdialog.h index 6a7474594204..55718f4ddd18 100644 --- a/src/gui/qgsdatumtransformdialog.h +++ b/src/gui/qgsdatumtransformdialog.h @@ -90,7 +90,7 @@ class GUI_EXPORT QgsDatumTransformDialog : public QDialog, private Ui::QgsDatumT bool forceChoice = true, QPair selectedDatumTransforms = qMakePair( -1, -1 ), QWidget *parent = nullptr, - Qt::WindowFlags f = nullptr, + Qt::WindowFlags f = Qt::WindowFlags(), const QString &selectedProj = QString(), QgsMapCanvas *mapCanvas = nullptr, bool allowFallback = true ); diff --git a/src/gui/qgsgui.cpp b/src/gui/qgsgui.cpp index 60cb4d470a75..3ff3e54bdb78 100644 --- a/src/gui/qgsgui.cpp +++ b/src/gui/qgsgui.cpp @@ -158,7 +158,7 @@ QgsGui::HigFlags QgsGui::higFlags() } else { - return nullptr; + return QgsGui::HigFlags(); } } diff --git a/src/gui/qgsguiutils.h b/src/gui/qgsguiutils.h index ae6c808e38e6..0e0426bf171d 100644 --- a/src/gui/qgsguiutils.h +++ b/src/gui/qgsguiutils.h @@ -51,7 +51,7 @@ namespace QgsGuiUtils * Qt::WindowMaximizeButtonHint is included but will be ignored if * the dialog is a fixed size and does not have a size grip. */ - static const Qt::WindowFlags ModalDialogFlags = nullptr; + static const Qt::WindowFlags ModalDialogFlags = Qt::WindowFlags(); /** * Minimum magnification level allowed in map canvases. diff --git a/src/gui/qgsmaplayeractionregistry.h b/src/gui/qgsmaplayeractionregistry.h index f9350c05c91a..a55e87128ca6 100644 --- a/src/gui/qgsmaplayeractionregistry.h +++ b/src/gui/qgsmaplayeractionregistry.h @@ -128,9 +128,9 @@ class GUI_EXPORT QgsMapLayerAction : public QAction QgsMapLayerType mLayerType = QgsMapLayerType::VectorLayer; // determine if the action can be run on layer and/or single feature and/or multiple features - Targets mTargets = nullptr; + Targets mTargets = Targets(); - QgsMapLayerAction::Flags mFlags = nullptr; + QgsMapLayerAction::Flags mFlags = QgsMapLayerAction::Flags(); }; Q_DECLARE_OPERATORS_FOR_FLAGS( QgsMapLayerAction::Targets ) diff --git a/src/gui/qgsoptionsdialogbase.h b/src/gui/qgsoptionsdialogbase.h index 46f61f8bdab0..ad080ea3038d 100644 --- a/src/gui/qgsoptionsdialogbase.h +++ b/src/gui/qgsoptionsdialogbase.h @@ -72,7 +72,7 @@ class GUI_EXPORT QgsOptionsDialogBase : public QDialog * \param fl widget flags * \param settings custom QgsSettings pointer */ - QgsOptionsDialogBase( const QString &settingsKey, QWidget *parent SIP_TRANSFERTHIS = nullptr, Qt::WindowFlags fl = nullptr, QgsSettings *settings = nullptr ); + QgsOptionsDialogBase( const QString &settingsKey, QWidget *parent SIP_TRANSFERTHIS = nullptr, Qt::WindowFlags fl = Qt::WindowFlags(), QgsSettings *settings = nullptr ); ~QgsOptionsDialogBase() override; /** diff --git a/src/gui/qgsrasterlayersaveasdialog.h b/src/gui/qgsrasterlayersaveasdialog.h index cb07e7fc0946..33f1216a35eb 100644 --- a/src/gui/qgsrasterlayersaveasdialog.h +++ b/src/gui/qgsrasterlayersaveasdialog.h @@ -58,7 +58,7 @@ class GUI_EXPORT QgsRasterLayerSaveAsDialog: public QDialog, private Ui::QgsRast const QgsCoordinateReferenceSystem &layerCrs, const QgsCoordinateReferenceSystem ¤tCrs, QWidget *parent SIP_TRANSFERTHIS = nullptr, - Qt::WindowFlags f = nullptr ); + Qt::WindowFlags f = Qt::WindowFlags() ); Mode mode() const; int nColumns() const; diff --git a/src/gui/qgssublayersdialog.h b/src/gui/qgssublayersdialog.h index c1aad1d31c20..f7ba2f3229b7 100644 --- a/src/gui/qgssublayersdialog.h +++ b/src/gui/qgssublayersdialog.h @@ -101,7 +101,7 @@ class GUI_EXPORT QgsSublayersDialog : public QDialog, private Ui::QgsSublayersDi QgsSublayersDialog( ProviderType providerType, const QString &name, QWidget *parent SIP_TRANSFERTHIS = nullptr, - Qt::WindowFlags fl = nullptr, + Qt::WindowFlags fl = Qt::WindowFlags(), const QString &dataSourceUri = QString() ); ~QgsSublayersDialog() override; diff --git a/src/gui/qgssymbolbutton.cpp b/src/gui/qgssymbolbutton.cpp index 511bc23fa2d7..0d4e3632c4f1 100644 --- a/src/gui/qgssymbolbutton.cpp +++ b/src/gui/qgssymbolbutton.cpp @@ -647,7 +647,7 @@ void QgsSymbolButton::showColorDialog() return; } - QgsColorDialog dialog( this, nullptr, mSymbol->color() ); + QgsColorDialog dialog( this, Qt::WindowFlags(), mSymbol->color() ); dialog.setTitle( tr( "Symbol Color" ) ); dialog.setAllowOpacity( true ); diff --git a/src/gui/qgstablewidgetitem.cpp b/src/gui/qgstablewidgetitem.cpp index e55e68bdae81..7d7516fa2494 100644 --- a/src/gui/qgstablewidgetitem.cpp +++ b/src/gui/qgstablewidgetitem.cpp @@ -14,6 +14,7 @@ * * ***************************************************************************/ #include "qgstablewidgetitem.h" +#include "qgis.h" QgsTableWidgetItem::QgsTableWidgetItem( const QString &text ) : QTableWidgetItem( text ) @@ -32,5 +33,5 @@ int QgsTableWidgetItem::sortRole() const bool QgsTableWidgetItem::operator<( const QTableWidgetItem &other ) const { - return data( mSortRole ) < other.data( mSortRole ); + return qgsVariantLessThan( data( mSortRole ), other.data( mSortRole ) ); } diff --git a/src/gui/symbology/qgscptcitycolorrampdialog.cpp b/src/gui/symbology/qgscptcitycolorrampdialog.cpp index 94bfca00fe97..4627dfc1110a 100644 --- a/src/gui/symbology/qgscptcitycolorrampdialog.cpp +++ b/src/gui/symbology/qgscptcitycolorrampdialog.cpp @@ -337,7 +337,7 @@ void QgsCptCityColorRampDialog::pbtnLicenseDetails_pressed() descFile = mArchive->descFileName( path ); // prepare dialog - QgsDialog dlg( this, nullptr, QDialogButtonBox::Close ); + QgsDialog dlg( this, Qt::WindowFlags(), QDialogButtonBox::Close ); QVBoxLayout *layout = dlg.layout(); dlg.setWindowTitle( title ); QTextEdit *textEdit = new QTextEdit( &dlg ); diff --git a/src/gui/symbology/qgsdashspacedialog.h b/src/gui/symbology/qgsdashspacedialog.h index 97526ef96b66..572756a89afc 100644 --- a/src/gui/symbology/qgsdashspacedialog.h +++ b/src/gui/symbology/qgsdashspacedialog.h @@ -63,7 +63,7 @@ class GUI_EXPORT QgsDashSpaceDialog : public QDialog public: //! Constructor for QgsDashSpaceDialog - QgsDashSpaceDialog( const QVector &v, QWidget *parent SIP_TRANSFERTHIS = nullptr, Qt::WindowFlags f = nullptr ); + QgsDashSpaceDialog( const QVector &v, QWidget *parent SIP_TRANSFERTHIS = nullptr, Qt::WindowFlags f = Qt::WindowFlags() ); //! Returns the dash pattern as a list of numbers QVector dashDotVector() const; diff --git a/src/gui/vector/qgsattributesformproperties.cpp b/src/gui/vector/qgsattributesformproperties.cpp index b1674e784b67..681725c24b9d 100644 --- a/src/gui/vector/qgsattributesformproperties.cpp +++ b/src/gui/vector/qgsattributesformproperties.cpp @@ -254,7 +254,7 @@ void QgsAttributesFormProperties::loadAttributeTypeDialog() mAttributeTypeDialog->setUnique( constraints.constraints() & QgsFieldConstraints::ConstraintUnique ); mAttributeTypeDialog->setUniqueEnforced( constraints.constraintStrength( QgsFieldConstraints::ConstraintUnique ) == QgsFieldConstraints::ConstraintStrengthHard ); - QgsFieldConstraints::Constraints providerConstraints = nullptr; + QgsFieldConstraints::Constraints providerConstraints = QgsFieldConstraints::Constraints(); if ( constraints.constraintOrigin( QgsFieldConstraints::ConstraintNotNull ) == QgsFieldConstraints::ConstraintOriginProvider ) providerConstraints |= QgsFieldConstraints::ConstraintNotNull; if ( constraints.constraintOrigin( QgsFieldConstraints::ConstraintUnique ) == QgsFieldConstraints::ConstraintOriginProvider ) diff --git a/src/gui/vector/qgsjoindialog.h b/src/gui/vector/qgsjoindialog.h index 746069613c78..39d55d633ea2 100644 --- a/src/gui/vector/qgsjoindialog.h +++ b/src/gui/vector/qgsjoindialog.h @@ -31,7 +31,7 @@ class GUI_EXPORT QgsJoinDialog: public QDialog, private Ui::QgsJoinDialogBase { Q_OBJECT public: - QgsJoinDialog( QgsVectorLayer *layer, QList alreadyJoinedLayers, QWidget *parent = nullptr, Qt::WindowFlags f = nullptr ); + QgsJoinDialog( QgsVectorLayer *layer, QList alreadyJoinedLayers, QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags() ); //! Configure the dialog for an existing join void setJoinInfo( const QgsVectorLayerJoinInfo &joinInfo ); diff --git a/src/gui/vector/qgswmsdimensiondialog.h b/src/gui/vector/qgswmsdimensiondialog.h index 3f49661c9675..371663823c0c 100644 --- a/src/gui/vector/qgswmsdimensiondialog.h +++ b/src/gui/vector/qgswmsdimensiondialog.h @@ -42,7 +42,7 @@ class GUI_EXPORT QgsWmsDimensionDialog: public QDialog, private Ui::QgsWmsDimens { Q_OBJECT public: - QgsWmsDimensionDialog( QgsVectorLayer *layer, QStringList alreadyDefinedDimensions, QWidget *parent = nullptr, Qt::WindowFlags f = nullptr ); + QgsWmsDimensionDialog( QgsVectorLayer *layer, QStringList alreadyDefinedDimensions, QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags() ); QgsVectorLayerServerProperties::WmsDimensionInfo info() const; diff --git a/src/native/qgsnative.cpp b/src/native/qgsnative.cpp index 71607c0b126b..3f330ede1b8d 100644 --- a/src/native/qgsnative.cpp +++ b/src/native/qgsnative.cpp @@ -26,7 +26,7 @@ void QgsNative::cleanup() QgsNative::Capabilities QgsNative::capabilities() const { - return nullptr; + return QgsNative::Capabilities(); } void QgsNative::initializeMainWindow( QWindow *, diff --git a/src/plugins/offline_editing/offline_editing_plugin_gui.h b/src/plugins/offline_editing/offline_editing_plugin_gui.h index 2979358bcd3b..e24abcecd43e 100644 --- a/src/plugins/offline_editing/offline_editing_plugin_gui.h +++ b/src/plugins/offline_editing/offline_editing_plugin_gui.h @@ -40,7 +40,7 @@ class QgsOfflineEditingPluginGui : public QDialog, private Ui::QgsOfflineEditing Q_OBJECT public: - QgsOfflineEditingPluginGui( QWidget *parent = nullptr, Qt::WindowFlags fl = nullptr ); + QgsOfflineEditingPluginGui( QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags() ); ~QgsOfflineEditingPluginGui() override; QString offlineDataPath(); diff --git a/src/plugins/offline_editing/offline_editing_progress_dialog.h b/src/plugins/offline_editing/offline_editing_progress_dialog.h index 616096abfa8d..4953dd030e73 100644 --- a/src/plugins/offline_editing/offline_editing_progress_dialog.h +++ b/src/plugins/offline_editing/offline_editing_progress_dialog.h @@ -27,7 +27,7 @@ class QgsOfflineEditingProgressDialog : public QDialog, private Ui::QgsOfflineEd Q_OBJECT public: - QgsOfflineEditingProgressDialog( QWidget *parent = nullptr, Qt::WindowFlags fl = nullptr ); + QgsOfflineEditingProgressDialog( QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags() ); void setTitle( const QString &title ); void setCurrentLayer( int layer, int numLayers ); diff --git a/src/providers/arcgisrest/qgsafsdataitems.cpp b/src/providers/arcgisrest/qgsafsdataitems.cpp index 2fac6c0a1376..eb6e00ac0d7f 100644 --- a/src/providers/arcgisrest/qgsafsdataitems.cpp +++ b/src/providers/arcgisrest/qgsafsdataitems.cpp @@ -52,7 +52,7 @@ QVector QgsAfsRootItem::createChildren() #ifdef HAVE_GUI QWidget *QgsAfsRootItem::paramWidget() { - QgsAfsSourceSelect *select = new QgsAfsSourceSelect( nullptr, nullptr, QgsProviderRegistry::WidgetMode::Manager ); + QgsAfsSourceSelect *select = new QgsAfsSourceSelect( nullptr, Qt::WindowFlags(), QgsProviderRegistry::WidgetMode::Manager ); connect( select, &QgsArcGisServiceSourceSelect::connectionsChanged, this, &QgsAfsRootItem::onConnectionsChanged ); return select; } diff --git a/src/providers/arcgisrest/qgsamsdataitems.cpp b/src/providers/arcgisrest/qgsamsdataitems.cpp index dcf324c0c2ef..396de6524d5f 100644 --- a/src/providers/arcgisrest/qgsamsdataitems.cpp +++ b/src/providers/arcgisrest/qgsamsdataitems.cpp @@ -50,7 +50,7 @@ QVector QgsAmsRootItem::createChildren() #ifdef HAVE_GUI QWidget *QgsAmsRootItem::paramWidget() { - QgsAmsSourceSelect *select = new QgsAmsSourceSelect( nullptr, nullptr, QgsProviderRegistry::WidgetMode::Manager ); + QgsAmsSourceSelect *select = new QgsAmsSourceSelect( nullptr, Qt::WindowFlags(), QgsProviderRegistry::WidgetMode::Manager ); connect( select, &QgsArcGisServiceSourceSelect::connectionsChanged, this, &QgsAmsRootItem::onConnectionsChanged ); return select; } diff --git a/src/providers/mssql/qgsmssqldataitems.cpp b/src/providers/mssql/qgsmssqldataitems.cpp index 8f9d65096d4a..3aac74a4186a 100644 --- a/src/providers/mssql/qgsmssqldataitems.cpp +++ b/src/providers/mssql/qgsmssqldataitems.cpp @@ -638,7 +638,7 @@ QVector QgsMssqlRootItem::createChildren() #ifdef HAVE_GUI QWidget *QgsMssqlRootItem::paramWidget() { - QgsMssqlSourceSelect *select = new QgsMssqlSourceSelect( nullptr, nullptr, QgsProviderRegistry::WidgetMode::Manager ); + QgsMssqlSourceSelect *select = new QgsMssqlSourceSelect( nullptr, Qt::WindowFlags(), QgsProviderRegistry::WidgetMode::Manager ); connect( select, &QgsMssqlSourceSelect::connectionsChanged, this, &QgsMssqlRootItem::onConnectionsChanged ); return select; } diff --git a/src/providers/mssql/qgsmssqlproviderconnection.h b/src/providers/mssql/qgsmssqlproviderconnection.h index 6bd628e84806..11d62812e46b 100644 --- a/src/providers/mssql/qgsmssqlproviderconnection.h +++ b/src/providers/mssql/qgsmssqlproviderconnection.h @@ -43,7 +43,7 @@ class QgsMssqlProviderConnection : public QgsAbstractDatabaseProviderConnection void dropSchema( const QString &name, bool force = false ) const override; QList executeSql( const QString &sql, QgsFeedback *feedback ) const override; QList tables( const QString &schema, - const TableFlags &flags = nullptr ) const override; + const TableFlags &flags = TableFlags() ) const override; QStringList schemas( ) const override; void store( const QString &name ) const override; void remove( const QString &name ) const override; diff --git a/src/providers/postgres/qgspostgresdataitemguiprovider.cpp b/src/providers/postgres/qgspostgresdataitemguiprovider.cpp index 65ba006e9dd4..fc8d0585508e 100644 --- a/src/providers/postgres/qgspostgresdataitemguiprovider.cpp +++ b/src/providers/postgres/qgspostgresdataitemguiprovider.cpp @@ -173,7 +173,7 @@ QWidget *QgsPostgresDataItemGuiProvider::createParamWidget( QgsDataItem *root, Q QgsPGRootItem *pgRootItem = qobject_cast( root ); if ( pgRootItem != nullptr ) { - QgsPgSourceSelect *select = new QgsPgSourceSelect( nullptr, nullptr, QgsProviderRegistry::WidgetMode::Manager ); + QgsPgSourceSelect *select = new QgsPgSourceSelect( nullptr, QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode::Manager ); connect( select, &QgsPgSourceSelect::connectionsChanged, pgRootItem, &QgsPGRootItem::onConnectionsChanged ); return select; } diff --git a/src/providers/postgres/qgspostgresprovider.h b/src/providers/postgres/qgspostgresprovider.h index d520f1dd3a31..fbf9f99309fe 100644 --- a/src/providers/postgres/qgspostgresprovider.h +++ b/src/providers/postgres/qgspostgresprovider.h @@ -447,7 +447,7 @@ class QgsPostgresProvider final: public QgsVectorDataProvider // A function that determines if the given columns contain unique entries bool uniqueData( const QString "edColNames ); - QgsVectorDataProvider::Capabilities mEnabledCapabilities = nullptr; + QgsVectorDataProvider::Capabilities mEnabledCapabilities = QgsVectorDataProvider::Capabilities(); void appendGeomParam( const QgsGeometry &geom, QStringList ¶m ) const; void appendPkParams( QgsFeatureId fid, QStringList ¶m ) const; diff --git a/src/providers/postgres/qgspostgresproviderconnection.h b/src/providers/postgres/qgspostgresproviderconnection.h index b7426ac60715..c88ec2b569ab 100644 --- a/src/providers/postgres/qgspostgresproviderconnection.h +++ b/src/providers/postgres/qgspostgresproviderconnection.h @@ -52,7 +52,7 @@ class QgsPostgresProviderConnection : public QgsAbstractDatabaseProviderConnecti bool spatialIndexExists( const QString &schema, const QString &name, const QString &geometryColumn ) const override; void deleteSpatialIndex( const QString &schema, const QString &name, const QString &geometryColumn ) const override; QList tables( const QString &schema, - const TableFlags &flags = nullptr ) const override; + const TableFlags &flags = TableFlags() ) const override; QStringList schemas( ) const override; void store( const QString &name ) const override; void remove( const QString &name ) const override; diff --git a/src/providers/spatialite/qgsspatialitedataitems.cpp b/src/providers/spatialite/qgsspatialitedataitems.cpp index e19afc37a48d..58a647d2b53e 100644 --- a/src/providers/spatialite/qgsspatialitedataitems.cpp +++ b/src/providers/spatialite/qgsspatialitedataitems.cpp @@ -184,7 +184,7 @@ QVector QgsSLRootItem::createChildren() QWidget *QgsSLRootItem::paramWidget() { - QgsSpatiaLiteSourceSelect *select = new QgsSpatiaLiteSourceSelect( nullptr, nullptr, QgsProviderRegistry::WidgetMode::Manager ); + QgsSpatiaLiteSourceSelect *select = new QgsSpatiaLiteSourceSelect( nullptr, Qt::WindowFlags(), QgsProviderRegistry::WidgetMode::Manager ); connect( select, &QgsSpatiaLiteSourceSelect::connectionsChanged, this, &QgsSLRootItem::onConnectionsChanged ); return select; } diff --git a/src/providers/spatialite/qgsspatialiteprovider.h b/src/providers/spatialite/qgsspatialiteprovider.h index 5b894a03140f..edc4736da60e 100644 --- a/src/providers/spatialite/qgsspatialiteprovider.h +++ b/src/providers/spatialite/qgsspatialiteprovider.h @@ -317,7 +317,7 @@ class QgsSpatiaLiteProvider final: public QgsVectorDataProvider //! this Geometry is supported by an MBR cache spatial index bool mSpatialIndexMbrCache = false; - QgsVectorDataProvider::Capabilities mEnabledCapabilities = nullptr; + QgsVectorDataProvider::Capabilities mEnabledCapabilities = QgsVectorDataProvider::Capabilities(); QgsField field( int index ) const; diff --git a/src/providers/spatialite/qgsspatialiteproviderconnection.h b/src/providers/spatialite/qgsspatialiteproviderconnection.h index dbb1762c7006..c6f6cffd1f0b 100644 --- a/src/providers/spatialite/qgsspatialiteproviderconnection.h +++ b/src/providers/spatialite/qgsspatialiteproviderconnection.h @@ -43,7 +43,7 @@ class QgsSpatiaLiteProviderConnection : public QgsAbstractDatabaseProviderConnec void createSpatialIndex( const QString &schema, const QString &name, const QgsAbstractDatabaseProviderConnection::SpatialIndexOptions &options = QgsAbstractDatabaseProviderConnection::SpatialIndexOptions() ) const override; bool spatialIndexExists( const QString &schema, const QString &name, const QString &geometryColumn ) const override; QList tables( const QString &schema = QString(), - const TableFlags &flags = nullptr ) const override; + const TableFlags &flags = TableFlags() ) const override; QIcon icon() const override; void deleteField( const QString &fieldName, const QString &schema, const QString &tableName, bool force ) const override; QList nativeTypes() const override; diff --git a/src/providers/wcs/qgswcsdataitems.cpp b/src/providers/wcs/qgswcsdataitems.cpp index 27f6b7511079..5dd465c3f342 100644 --- a/src/providers/wcs/qgswcsdataitems.cpp +++ b/src/providers/wcs/qgswcsdataitems.cpp @@ -202,7 +202,7 @@ QVectorQgsWCSRootItem::createChildren() QWidget *QgsWCSRootItem::paramWidget() { - QgsWCSSourceSelect *select = new QgsWCSSourceSelect( nullptr, nullptr, QgsProviderRegistry::WidgetMode::Manager ); + QgsWCSSourceSelect *select = new QgsWCSSourceSelect( nullptr, Qt::WindowFlags(), QgsProviderRegistry::WidgetMode::Manager ); connect( select, &QgsOWSSourceSelect::connectionsChanged, this, &QgsWCSRootItem::onConnectionsChanged ); return select; } diff --git a/src/providers/wfs/qgswfsdataitems.cpp b/src/providers/wfs/qgswfsdataitems.cpp index 0d3826835829..a48937c66a01 100644 --- a/src/providers/wfs/qgswfsdataitems.cpp +++ b/src/providers/wfs/qgswfsdataitems.cpp @@ -253,7 +253,7 @@ QVector QgsWfsRootItem::createChildren() QWidget *QgsWfsRootItem::paramWidget() { - QgsWFSSourceSelect *select = new QgsWFSSourceSelect( nullptr, nullptr, QgsProviderRegistry::WidgetMode::Manager ); + QgsWFSSourceSelect *select = new QgsWFSSourceSelect( nullptr, Qt::WindowFlags(), QgsProviderRegistry::WidgetMode::Manager ); connect( select, &QgsWFSSourceSelect::connectionsChanged, this, &QgsWfsRootItem::onConnectionsChanged ); return select; } diff --git a/src/providers/wfs/qgswfsprovider.h b/src/providers/wfs/qgswfsprovider.h index 02b8099d8a35..add6ba1081bb 100644 --- a/src/providers/wfs/qgswfsprovider.h +++ b/src/providers/wfs/qgswfsprovider.h @@ -150,7 +150,7 @@ class QgsWFSProvider final: public QgsVectorDataProvider //! Namespace URL of the server (comes from DescribeFeatureDocument) QString mApplicationNamespace; //! Server capabilities for this layer (generated from capabilities document) - QgsVectorDataProvider::Capabilities mCapabilities = nullptr; + QgsVectorDataProvider::Capabilities mCapabilities = QgsVectorDataProvider::Capabilities(); //! Fields of this typename. Might be different from mShared->mFields in case of SELECT QgsFields mThisTypenameFields; diff --git a/src/providers/wms/qgstilescalewidget.h b/src/providers/wms/qgstilescalewidget.h index dac92d472d72..cfb18a5bfa1b 100644 --- a/src/providers/wms/qgstilescalewidget.h +++ b/src/providers/wms/qgstilescalewidget.h @@ -39,7 +39,7 @@ class QgsTileScaleWidget : public QWidget, private Ui::QgsTileScaleWidget void locationChanged( Qt::DockWidgetArea area ); private: - QgsTileScaleWidget( QgsMapCanvas *mapCanvas, QWidget *parent = nullptr, Qt::WindowFlags f = nullptr ); + QgsTileScaleWidget( QgsMapCanvas *mapCanvas, QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags() ); ~QgsTileScaleWidget() override = default; QgsMapCanvas *mMapCanvas = nullptr; diff --git a/src/providers/wms/qgswmsdataitemguiproviders.cpp b/src/providers/wms/qgswmsdataitemguiproviders.cpp index 22486a0a9579..0925952fd58b 100644 --- a/src/providers/wms/qgswmsdataitemguiproviders.cpp +++ b/src/providers/wms/qgswmsdataitemguiproviders.cpp @@ -31,7 +31,7 @@ static QWidget *_paramWidget( QgsDataItem *root ) { if ( qobject_cast( root ) != nullptr ) { - return new QgsWMSSourceSelect( nullptr, nullptr, QgsProviderRegistry::WidgetMode::Manager ); + return new QgsWMSSourceSelect( nullptr, Qt::WindowFlags(), QgsProviderRegistry::WidgetMode::Manager ); } else { diff --git a/src/providers/wms/qgswmtsdimensions.h b/src/providers/wms/qgswmtsdimensions.h index e4af877181df..8d08712ae1a3 100644 --- a/src/providers/wms/qgswmtsdimensions.h +++ b/src/providers/wms/qgswmtsdimensions.h @@ -36,7 +36,7 @@ class QgsWmtsDimensions : public QDialog, private Ui::QgsWmtsDimensionsBase public: //! Constructor - QgsWmtsDimensions( const QgsWmtsTileLayer &layer, QWidget *parent = nullptr, Qt::WindowFlags fl = nullptr ); + QgsWmtsDimensions( const QgsWmtsTileLayer &layer, QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags() ); void selectedDimensions( QHash &dims ); diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp index c317293d705a..d1af2e806cc2 100644 --- a/src/server/services/wms/qgswmsrenderer.cpp +++ b/src/server/services/wms/qgswmsrenderer.cpp @@ -2602,7 +2602,7 @@ namespace QgsWms { placement = QgsPalLayerSettings::AroundPoint; palSettings.dist = 2; // in mm - palSettings.lineSettings().setPlacementFlags( 0 ); + palSettings.lineSettings().setPlacementFlags( QgsLabeling::LinePlacementFlags() ); break; } case QgsWkbTypes::PolygonGeometry: diff --git a/tests/src/analysis/testqgsprocessing.cpp b/tests/src/analysis/testqgsprocessing.cpp index 56b171343078..0fb43d45ae59 100644 --- a/tests/src/analysis/testqgsprocessing.cpp +++ b/tests/src/analysis/testqgsprocessing.cpp @@ -262,7 +262,7 @@ class DummyAlgorithm : public QgsProcessingAlgorithm context.setProject( &p ); // flag not set - mFlags = nullptr; + mFlags = QgsProcessingAlgorithm::Flags(); parameters.insert( "p1", QVariant::fromValue( layer3111 ) ); QVERIFY( validateInputCrs( parameters, context ) ); mFlags = FlagRequiresMatchingCrs; @@ -271,7 +271,7 @@ class DummyAlgorithm : public QgsProcessingAlgorithm // two layers, different crs parameters.insert( "p2", QVariant::fromValue( layer4326 ) ); // flag not set - mFlags = nullptr; + mFlags = QgsProcessingAlgorithm::Flags(); QVERIFY( validateInputCrs( parameters, context ) ); mFlags = FlagRequiresMatchingCrs; QVERIFY( !validateInputCrs( parameters, context ) ); @@ -956,8 +956,8 @@ void TestQgsProcessing::context() context.setDefaultEncoding( "my_enc" ); QCOMPARE( context.defaultEncoding(), QStringLiteral( "my_enc" ) ); - context.setFlags( QgsProcessingContext::Flags( nullptr ) ); - QCOMPARE( context.flags(), QgsProcessingContext::Flags( nullptr ) ); + context.setFlags( QgsProcessingContext::Flags() ); + QCOMPARE( context.flags(), QgsProcessingContext::Flags() ); QCOMPARE( context.ellipsoid(), QString() ); QCOMPARE( context.distanceUnit(), QgsUnitTypes::DistanceUnknownUnit ); @@ -1419,7 +1419,7 @@ void TestQgsProcessing::features() QgsProcessingContext context; context.setProject( &p ); // disable check for geometry validity - context.setFlags( QgsProcessingContext::Flags( nullptr ) ); + context.setFlags( QgsProcessingContext::Flags() ); std::function< QgsFeatureIds( QgsFeatureIterator it ) > getIds = []( QgsFeatureIterator it ) { @@ -1543,7 +1543,7 @@ void TestQgsProcessing::features() QVERIFY( QgsProcessingFeatureSourceDefinition( layer->id(), true ) != QgsProcessingFeatureSourceDefinition( "b", true ) ); QVERIFY( QgsProcessingFeatureSourceDefinition( layer->id(), true ) != QgsProcessingFeatureSourceDefinition( layer->id(), false ) ); QVERIFY( QgsProcessingFeatureSourceDefinition( layer->id(), true ) != QgsProcessingFeatureSourceDefinition( layer->id(), true, 5 ) ); - QVERIFY( QgsProcessingFeatureSourceDefinition( layer->id(), true, 5, nullptr ) != QgsProcessingFeatureSourceDefinition( layer->id(), true, 5, QgsProcessingFeatureSourceDefinition::Flag::FlagOverrideDefaultGeometryCheck ) ); + QVERIFY( QgsProcessingFeatureSourceDefinition( layer->id(), true, 5, QgsProcessingFeatureSourceDefinition::Flags() ) != QgsProcessingFeatureSourceDefinition( layer->id(), true, 5, QgsProcessingFeatureSourceDefinition::Flag::FlagOverrideDefaultGeometryCheck ) ); QVERIFY( QgsProcessingFeatureSourceDefinition( layer->id(), true, 5, QgsProcessingFeatureSourceDefinition::Flag::FlagOverrideDefaultGeometryCheck, QgsFeatureRequest::GeometrySkipInvalid ) != QgsProcessingFeatureSourceDefinition( layer->id(), true, 5, QgsProcessingFeatureSourceDefinition::Flag::FlagOverrideDefaultGeometryCheck, QgsFeatureRequest::GeometryAbortOnInvalid ) ); } @@ -1558,7 +1558,7 @@ void TestQgsProcessing::uniqueValues() } QgsProcessingContext context; - context.setFlags( QgsProcessingContext::Flags( nullptr ) ); + context.setFlags( QgsProcessingContext::Flags() ); QgsProject p; p.addMapLayer( layer ); @@ -1922,7 +1922,7 @@ void TestQgsProcessing::createFeatureSink() fields2.append( QgsField( "field2", QVariant::String ) ); context.expressionContext().appendScope( new QgsExpressionContextScope() ); context.expressionContext().scope( 0 )->setVariable( QStringLiteral( "extra" ), 2 ); - sink.reset( QgsProcessingUtils::createFeatureSink( destination, context, fields2, QgsWkbTypes::Point, QgsCoordinateReferenceSystem::fromEpsgId( 4326 ), QVariantMap(), QStringList(), QStringList(), nullptr, &remapDef ) ); + sink.reset( QgsProcessingUtils::createFeatureSink( destination, context, fields2, QgsWkbTypes::Point, QgsCoordinateReferenceSystem::fromEpsgId( 4326 ), QVariantMap(), QStringList(), QStringList(), QgsFeatureSink::SinkFlags(), &remapDef ) ); QVERIFY( sink.get() ); f = QgsFeature( fields2 ); f.setGeometry( QgsGeometry::fromWkt( QStringLiteral( "Point(10 0)" ) ) ); @@ -1994,7 +1994,7 @@ void TestQgsProcessing::createFeatureSink() remapDef.setDestinationWkbType( QgsWkbTypes::Point ); remapDef.addMappedField( QStringLiteral( "my_field" ), QgsProperty::fromExpression( QStringLiteral( "field2 || @extra" ) ) ); destination2 = QStringLiteral( "ogr:dbname='%1' table=\"points\" (geom) sql=" ).arg( geopackagePath ); - sink.reset( QgsProcessingUtils::createFeatureSink( destination2, context, fields2, QgsWkbTypes::PointZ, QgsCoordinateReferenceSystem::fromEpsgId( 4326 ), QVariantMap(), QStringList(), QStringList(), nullptr, &remapDef ) ); + sink.reset( QgsProcessingUtils::createFeatureSink( destination2, context, fields2, QgsWkbTypes::PointZ, QgsCoordinateReferenceSystem::fromEpsgId( 4326 ), QVariantMap(), QStringList(), QStringList(), QgsFeatureSink::SinkFlags(), &remapDef ) ); QVERIFY( sink.get() ); f = QgsFeature( fields ); f.setGeometry( QgsGeometry::fromWkt( QStringLiteral( "PointZ(3 4 5)" ) ) ); @@ -5899,8 +5899,8 @@ void TestQgsProcessing::parameterFeatureSource() QCOMPARE( def->valueAsPythonString( QVariant::fromValue( QgsProcessingFeatureSourceDefinition( QgsProperty::fromExpression( "\"abc\" || \"def\"" ), true ) ), context ), QStringLiteral( "QgsProcessingFeatureSourceDefinition(QgsProperty.fromExpression('\"abc\" || \"def\"'), selectedFeaturesOnly=True, featureLimit=-1, geometryCheck=QgsFeatureRequest.GeometryAbortOnInvalid)" ) ); QCOMPARE( def->valueAsPythonString( QVariant::fromValue( QgsProcessingFeatureSourceDefinition( QgsProperty::fromValue( "abc" ), false, 11 ) ), context ), QStringLiteral( "QgsProcessingFeatureSourceDefinition('abc', selectedFeaturesOnly=False, featureLimit=11, geometryCheck=QgsFeatureRequest.GeometryAbortOnInvalid)" ) ); QCOMPARE( def->valueAsPythonString( QVariant::fromValue( QgsProcessingFeatureSourceDefinition( QgsProperty::fromExpression( "\"abc\" || \"def\"" ), false, 11 ) ), context ), QStringLiteral( "QgsProcessingFeatureSourceDefinition(QgsProperty.fromExpression('\"abc\" || \"def\"'), selectedFeaturesOnly=False, featureLimit=11, geometryCheck=QgsFeatureRequest.GeometryAbortOnInvalid)" ) ); - QCOMPARE( def->valueAsPythonString( QVariant::fromValue( QgsProcessingFeatureSourceDefinition( QgsProperty::fromValue( "abc" ), false, -1, nullptr, QgsFeatureRequest::GeometrySkipInvalid ) ), context ), QStringLiteral( "'abc'" ) ); - QCOMPARE( def->valueAsPythonString( QVariant::fromValue( QgsProcessingFeatureSourceDefinition( QgsProperty::fromExpression( "\"abc\" || \"def\"" ), false, -1, nullptr, QgsFeatureRequest::GeometrySkipInvalid ) ), context ), QStringLiteral( "QgsProperty.fromExpression('\"abc\" || \"def\"')" ) ); + QCOMPARE( def->valueAsPythonString( QVariant::fromValue( QgsProcessingFeatureSourceDefinition( QgsProperty::fromValue( "abc" ), false, -1, QgsProcessingFeatureSourceDefinition::Flags(), QgsFeatureRequest::GeometrySkipInvalid ) ), context ), QStringLiteral( "'abc'" ) ); + QCOMPARE( def->valueAsPythonString( QVariant::fromValue( QgsProcessingFeatureSourceDefinition( QgsProperty::fromExpression( "\"abc\" || \"def\"" ), false, -1, QgsProcessingFeatureSourceDefinition::Flags(), QgsFeatureRequest::GeometrySkipInvalid ) ), context ), QStringLiteral( "QgsProperty.fromExpression('\"abc\" || \"def\"')" ) ); QCOMPARE( def->valueAsPythonString( QVariant::fromValue( QgsProcessingFeatureSourceDefinition( QgsProperty::fromValue( "abc" ), false, -1, QgsProcessingFeatureSourceDefinition::Flag::FlagOverrideDefaultGeometryCheck, QgsFeatureRequest::GeometrySkipInvalid ) ), context ), QStringLiteral( "QgsProcessingFeatureSourceDefinition('abc', selectedFeaturesOnly=False, featureLimit=-1, flags=QgsProcessingFeatureSourceDefinition.FlagOverrideDefaultGeometryCheck, geometryCheck=QgsFeatureRequest.GeometrySkipInvalid)" ) ); QCOMPARE( def->valueAsPythonString( QVariant::fromValue( QgsProcessingFeatureSourceDefinition( QgsProperty::fromExpression( "\"abc\" || \"def\"" ), false, -1, QgsProcessingFeatureSourceDefinition::Flag::FlagOverrideDefaultGeometryCheck, QgsFeatureRequest::GeometrySkipInvalid ) ), context ), QStringLiteral( "QgsProcessingFeatureSourceDefinition(QgsProperty.fromExpression('\"abc\" || \"def\"'), selectedFeaturesOnly=False, featureLimit=-1, flags=QgsProcessingFeatureSourceDefinition.FlagOverrideDefaultGeometryCheck, geometryCheck=QgsFeatureRequest.GeometrySkipInvalid)" ) ); QCOMPARE( def->valueAsPythonString( QVariant::fromValue( QgsProcessingFeatureSourceDefinition( QgsProperty::fromValue( "abc" ), false, -1, QgsProcessingFeatureSourceDefinition::Flag::FlagCreateIndividualOutputPerInputFeature, QgsFeatureRequest::GeometrySkipInvalid ) ), context ), QStringLiteral( "QgsProcessingFeatureSourceDefinition('abc', selectedFeaturesOnly=False, featureLimit=-1, flags=QgsProcessingFeatureSourceDefinition.FlagCreateIndividualOutputPerInputFeature, geometryCheck=QgsFeatureRequest.GeometrySkipInvalid)" ) ); diff --git a/tests/src/core/testqgslayoutcontext.cpp b/tests/src/core/testqgslayoutcontext.cpp index 4fddd855a79f..e59df67e740b 100644 --- a/tests/src/core/testqgslayoutcontext.cpp +++ b/tests/src/core/testqgslayoutcontext.cpp @@ -175,7 +175,7 @@ void TestQgsLayoutContext::dpi() void TestQgsLayoutContext::renderContextFlags() { QgsLayoutRenderContext context( nullptr ); - context.setFlags( nullptr ); + context.setFlags( QgsLayoutRenderContext::Flags() ); QgsRenderContext::Flags flags = context.renderContextFlags(); QVERIFY( !( flags & QgsRenderContext::Antialiasing ) ); QVERIFY( !( flags & QgsRenderContext::UseAdvancedEffects ) ); diff --git a/tests/src/core/testqgslayoutmodel.cpp b/tests/src/core/testqgslayoutmodel.cpp index bd58cf9718aa..04217eacda00 100644 --- a/tests/src/core/testqgslayoutmodel.cpp +++ b/tests/src/core/testqgslayoutmodel.cpp @@ -1012,7 +1012,7 @@ void TestQgsLayoutModel::proxy() QCOMPARE( proxy->rowCount( QModelIndex() ), 2 ); QCOMPARE( proxy->data( proxy->index( 0, 2, QModelIndex() ) ).toString(), QStringLiteral( "d" ) ); QCOMPARE( proxy->data( proxy->index( 1, 2, QModelIndex() ) ).toString(), QStringLiteral( "e" ) ); - proxy->setItemFlags( nullptr ); + proxy->setItemFlags( QgsLayoutItem::Flags() ); QCOMPARE( proxy->rowCount( QModelIndex() ), 5 ); } diff --git a/tests/src/core/testqgslayoututils.cpp b/tests/src/core/testqgslayoututils.cpp index 1d300e0d81a9..547962d6dcdf 100644 --- a/tests/src/core/testqgslayoututils.cpp +++ b/tests/src/core/testqgslayoututils.cpp @@ -267,7 +267,7 @@ void TestQgsLayoutUtils::createRenderContextFromLayout() QVERIFY( !rc.painter() ); // check render context flags are correctly set - l.renderContext().setFlags( nullptr ); + l.renderContext().setFlags( QgsLayoutRenderContext::Flags() ); rc = QgsLayoutUtils::createRenderContextForLayout( &l, nullptr ); QVERIFY( !( rc.flags() & QgsRenderContext::Antialiasing ) ); QVERIFY( !( rc.flags() & QgsRenderContext::UseAdvancedEffects ) ); @@ -347,7 +347,7 @@ void TestQgsLayoutUtils::createRenderContextFromMap() QVERIFY( rc.painter() ); // check render context flags are correctly set - l.renderContext().setFlags( nullptr ); + l.renderContext().setFlags( QgsLayoutRenderContext::Flags() ); rc = QgsLayoutUtils::createRenderContextForMap( map2, &p ); QVERIFY( !( rc.flags() & QgsRenderContext::Antialiasing ) ); QVERIFY( !( rc.flags() & QgsRenderContext::UseAdvancedEffects ) ); diff --git a/tests/src/core/testqgsstatisticalsummary.cpp b/tests/src/core/testqgsstatisticalsummary.cpp index e764fd03e6b3..8de340031315 100644 --- a/tests/src/core/testqgsstatisticalsummary.cpp +++ b/tests/src/core/testqgsstatisticalsummary.cpp @@ -249,7 +249,7 @@ void TestQgsStatisticSummary::individualStatCalculations() QFETCH( double, expected ); //start with a summary which calculates NO statistics - QgsStatisticalSummary s( QgsStatisticalSummary::Statistics( nullptr ) ); + QgsStatisticalSummary s{ QgsStatisticalSummary::Statistics() }; //set it to calculate just a single statistic s.setStatistics( stat ); QCOMPARE( s.statistics(), stat ); @@ -258,7 +258,7 @@ void TestQgsStatisticSummary::individualStatCalculations() QGSCOMPARENEAR( s.statistic( stat ), expected, 0.00001 ); //also test using values added one-at-a-time - QgsStatisticalSummary s2( QgsStatisticalSummary::Statistics( nullptr ) ); + QgsStatisticalSummary s2{ QgsStatisticalSummary::Statistics() }; s2.setStatistics( stat ); s2.addValue( 4 ); s2.addValue( 4 ); diff --git a/tests/src/core/testqgstaskmanager.cpp b/tests/src/core/testqgstaskmanager.cpp index a66ce1aa4bf6..8760fbc6f3ff 100644 --- a/tests/src/core/testqgstaskmanager.cpp +++ b/tests/src/core/testqgstaskmanager.cpp @@ -412,7 +412,7 @@ void TestQgsTaskManager::task() QCOMPARE( task->status(), QgsTask::Terminated ); // test flags - task.reset( new TestTask( QStringLiteral( "test_task_6" ), nullptr ) ); + task.reset( new TestTask( QStringLiteral( "test_task_6" ), QgsTask::Flags() ) ); QVERIFY( !task->canCancel() ); QVERIFY( !( task->flags() & QgsTask::CanCancel ) ); task.reset( new TestTask( QStringLiteral( "test_task_7" ), QgsTask::CanCancel ) ); diff --git a/tests/src/gui/testprocessinggui.cpp b/tests/src/gui/testprocessinggui.cpp index cefe6973b97d..7dd8cb2420da 100644 --- a/tests/src/gui/testprocessinggui.cpp +++ b/tests/src/gui/testprocessinggui.cpp @@ -5274,7 +5274,7 @@ void TestProcessingGui::mapLayerComboBox() sourceDef.flags |= QgsProcessingFeatureSourceDefinition::Flag::FlagCreateIndividualOutputPerInputFeature; combo->setValue( sourceDef, context ); QVERIFY( combo->value().value< QgsProcessingFeatureSourceDefinition >().flags & QgsProcessingFeatureSourceDefinition::Flag::FlagCreateIndividualOutputPerInputFeature ); - sourceDef.flags = nullptr; + sourceDef.flags = QgsProcessingFeatureSourceDefinition::Flags(); combo->setValue( sourceDef, context ); QVERIFY( !( combo->value().value< QgsProcessingFeatureSourceDefinition >().flags & QgsProcessingFeatureSourceDefinition::Flag::FlagCreateIndividualOutputPerInputFeature ) ); @@ -5290,7 +5290,7 @@ void TestProcessingGui::mapLayerComboBox() combo->setValue( sourceDef, context ); QVERIFY( combo->value().value< QgsProcessingFeatureSourceDefinition >().flags & QgsProcessingFeatureSourceDefinition::Flag::FlagOverrideDefaultGeometryCheck ); QCOMPARE( combo->value().value< QgsProcessingFeatureSourceDefinition >().geometryCheck, QgsFeatureRequest::GeometrySkipInvalid ); - sourceDef.flags = nullptr; + sourceDef.flags = QgsProcessingFeatureSourceDefinition::Flags(); combo->setValue( sourceDef, context ); QVERIFY( !( combo->value().value< QgsProcessingFeatureSourceDefinition >().flags & QgsProcessingFeatureSourceDefinition::Flag::FlagOverrideDefaultGeometryCheck ) ); diff --git a/tests/src/gui/testqgsdatumtransformdialog.cpp b/tests/src/gui/testqgsdatumtransformdialog.cpp index d7cd41363849..19ae3b23c359 100644 --- a/tests/src/gui/testqgsdatumtransformdialog.cpp +++ b/tests/src/gui/testqgsdatumtransformdialog.cpp @@ -127,7 +127,7 @@ void TestQgsDatumTransformDialog::fallback() { #if PROJ_VERSION_MAJOR>=6 // don't default to allow fallback - QgsDatumTransformDialog dlg( QgsCoordinateReferenceSystem( QStringLiteral( "EPSG:7844" ) ), QgsCoordinateReferenceSystem( QStringLiteral( "EPSG:4283" ) ), false, true, false, qMakePair( -1, -1 ), nullptr, nullptr, QString(), nullptr, false ); + QgsDatumTransformDialog dlg( QgsCoordinateReferenceSystem( QStringLiteral( "EPSG:7844" ) ), QgsCoordinateReferenceSystem( QStringLiteral( "EPSG:4283" ) ), false, true, false, qMakePair( -1, -1 ), nullptr, Qt::WindowFlags(), QString(), nullptr, false ); QgsDatumTransformDialog::TransformInfo def = dlg.selectedDatumTransform(); QCOMPARE( def.sourceCrs.authid(), QStringLiteral( "EPSG:7844" ) ); diff --git a/tests/src/gui/testqgsnewdatabasetablewidget.cpp b/tests/src/gui/testqgsnewdatabasetablewidget.cpp index fd74a610a458..72666c187434 100644 --- a/tests/src/gui/testqgsnewdatabasetablewidget.cpp +++ b/tests/src/gui/testqgsnewdatabasetablewidget.cpp @@ -134,7 +134,7 @@ void TestQgsNewDatabaseTableNameWidget::testWidgetSignalsPostgres() QCOMPARE( w->mBrowserModel->data( index, Qt::DisplayRole ).toString(), QString( "PostGIS" ) ); QRect rect = w->mBrowserTreeView->visualRect( w->mBrowserProxyModel.mapFromSource( index ) ); QVERIFY( rect.isValid() ); - QTest::mouseClick( w->mBrowserTreeView->viewport(), Qt::LeftButton, 0, rect.topLeft() ); + QTest::mouseClick( w->mBrowserTreeView->viewport(), Qt::LeftButton, Qt::KeyboardModifiers(), rect.topLeft() ); QVERIFY( ! w->isValid() ); @@ -160,7 +160,7 @@ void TestQgsNewDatabaseTableNameWidget::testWidgetSignalsPostgres() w->mBrowserTreeView->scrollTo( w->mBrowserProxyModel.mapFromSource( index ) ); rect = w->mBrowserTreeView->visualRect( w->mBrowserProxyModel.mapFromSource( index ) ); QVERIFY( rect.isValid() ); - QTest::mouseClick( w->mBrowserTreeView->viewport(), Qt::LeftButton, 0, rect.center() ); + QTest::mouseClick( w->mBrowserTreeView->viewport(), Qt::LeftButton, Qt::KeyboardModifiers(), rect.center() ); QVERIFY( ! w->isValid() ); @@ -203,7 +203,7 @@ void TestQgsNewDatabaseTableNameWidget::testWidgetSignalsPostgres() w->mBrowserTreeView->scrollTo( w->mBrowserProxyModel.mapFromSource( index ) ); rect = w->mBrowserTreeView->visualRect( w->mBrowserProxyModel.mapFromSource( index ) ); QVERIFY( rect.isValid() ); - QTest::mouseClick( w->mBrowserTreeView->viewport(), Qt::LeftButton, 0, rect.center() ); + QTest::mouseClick( w->mBrowserTreeView->viewport(), Qt::LeftButton, Qt::KeyboardModifiers(), rect.center() ); QCOMPARE( w->schema(), QString( "public" ) ); QVERIFY( w->isValid() ); QCOMPARE( validationSpy.count(), 1 ); @@ -253,7 +253,7 @@ void TestQgsNewDatabaseTableNameWidget::testWidgetSignalsGeopackage() w->mBrowserTreeView->scrollTo( w->mBrowserProxyModel.mapFromSource( index ) ); auto rect = w->mBrowserTreeView->visualRect( w->mBrowserProxyModel.mapFromSource( index ) ); QVERIFY( rect.isValid() ); - QTest::mouseClick( w->mBrowserTreeView->viewport(), Qt::LeftButton, 0, rect.center() ); + QTest::mouseClick( w->mBrowserTreeView->viewport(), Qt::LeftButton, Qt::KeyboardModifiers(), rect.center() ); QVERIFY( ! w->isValid() ); QCOMPARE( schemaSpy.count(), 1 ); diff --git a/tests/src/gui/testqgsprocessingmodel.cpp b/tests/src/gui/testqgsprocessingmodel.cpp index 665aa77f1933..af494ea2a933 100644 --- a/tests/src/gui/testqgsprocessingmodel.cpp +++ b/tests/src/gui/testqgsprocessingmodel.cpp @@ -34,7 +34,7 @@ class DummyAlgorithm : public QgsProcessingAlgorithm public: DummyAlgorithm( const QString &name, const QString &group, - QgsProcessingAlgorithm::Flags flags = 0, + QgsProcessingAlgorithm::Flags flags = QgsProcessingAlgorithm::Flags(), const QString &tags = QString(), const QString &shortDescription = QString(), const QString &displayName = QString() ) @@ -61,7 +61,7 @@ class DummyAlgorithm : public QgsProcessingAlgorithm QString mName; QString mDisplayName; QString mGroup; - QgsProcessingAlgorithm::Flags mFlags = nullptr; + QgsProcessingAlgorithm::Flags mFlags = QgsProcessingAlgorithm::Flags(); QStringList mTags; QString mShortDescription; @@ -446,7 +446,7 @@ void TestQgsProcessingModel::testProxyModel() QCOMPARE( model.data( model.index( 0, 0, group1Index ), Qt::DisplayRole ).toString(), QStringLiteral( "a1" ) ); // test filter strings - model.setFilters( nullptr ); + model.setFilters( QgsProcessingToolboxProxyModel::Filters() ); // filter by algorithm id model.setFilterString( "a1" ); QCOMPARE( model.rowCount(), 2 ); @@ -615,7 +615,7 @@ void TestQgsProcessingModel::testView() QCOMPARE( view.model()->rowCount( group2Index ), 1 ); QCOMPARE( view.algorithmForIndex( view.model()->index( 0, 0, group2Index ) )->id(), QStringLiteral( "p1:a2" ) ); - view.setFilters( nullptr ); + view.setFilters( QgsProcessingToolboxProxyModel::Filters() ); QCOMPARE( view.filters(), QgsProcessingToolboxProxyModel::Filters() ); // test filter strings view.setFilterString( "a1" ); @@ -662,7 +662,7 @@ void TestQgsProcessingModel::testKnownIssues() QgsProcessingRecentAlgorithmLog recentLog; QgsProcessingToolboxModel model( nullptr, ®istry, &recentLog ); DummyAlgorithm *a1 = new DummyAlgorithm( "a1", "group1", QgsProcessingAlgorithm::FlagKnownIssues, QStringLiteral( "tag1,tag2" ), QStringLiteral( "short desc a" ) ); - DummyAlgorithm *a2 = new DummyAlgorithm( "b1", "group1", nullptr, QStringLiteral( "tag1,tag2" ), QStringLiteral( "short desc b" ) ); + DummyAlgorithm *a2 = new DummyAlgorithm( "b1", "group1", QgsProcessingAlgorithm::Flags(), QStringLiteral( "tag1,tag2" ), QStringLiteral( "short desc b" ) ); DummyProvider *p = new DummyProvider( "p3", "provider3", QList< QgsProcessingAlgorithm * >() << a1 << a2 ); registry.addProvider( p );