mirror of
https://github.com/qgis/QGIS.git
synced 2025-10-06 00:07:29 -04:00
Fix all remaining Qt QFlags deprecated constructor warnings
This commit is contained in:
Nyall Dawson
parent
09f84eb84b
commit
ab6bbfda1d
@ -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;
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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() );
|
||||
|
||||
|
||||
};
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -53,7 +53,7 @@ A dialog to enter a custom dash space pattern for lines
|
||||
%End
|
||||
public:
|
||||
|
||||
QgsDashSpaceDialog( const QVector<qreal> &v, QWidget *parent /TransferThis/ = 0, Qt::WindowFlags f = 0 );
|
||||
QgsDashSpaceDialog( const QVector<qreal> &v, QWidget *parent /TransferThis/ = 0, Qt::WindowFlags f = Qt::WindowFlags() );
|
||||
%Docstring
|
||||
Constructor for QgsDashSpaceDialog
|
||||
%End
|
||||
|
||||
@ -34,7 +34,7 @@ class QgsCollectorAlgorithm : public QgsProcessingAlgorithm
|
||||
protected:
|
||||
|
||||
QVariantMap processCollection( const QVariantMap ¶meters, QgsProcessingContext &context, QgsProcessingFeedback *feedback,
|
||||
const std::function<QgsGeometry( const QVector<QgsGeometry>& )> &collector, int maxQueueLength = 0, QgsProcessingFeatureSource::Flags sourceFlags = nullptr );
|
||||
const std::function<QgsGeometry( const QVector<QgsGeometry>& )> &collector, int maxQueueLength = 0, QgsProcessingFeatureSource::Flags sourceFlags = QgsProcessingFeatureSource::Flags() );
|
||||
};
|
||||
|
||||
/**
|
||||
|
||||
@ -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 );
|
||||
|
||||
@ -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 );
|
||||
|
||||
@ -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 );
|
||||
|
||||
@ -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<QString, QgsFeaturePool *> &featurePools, QgsGeometryCheckError *error, int method, const QMap<QString, int> &mergeAttributeIndices, QgsGeometryCheck::Changes &changes ) const
|
||||
|
||||
@ -351,7 +351,7 @@ QString QgsGeometrySelfIntersectionCheck::factoryDescription()
|
||||
|
||||
QgsGeometryCheck::Flags QgsGeometrySelfIntersectionCheck::factoryFlags()
|
||||
{
|
||||
return nullptr;
|
||||
return QgsGeometryCheck::Flags();
|
||||
}
|
||||
|
||||
QString QgsGeometrySelfIntersectionCheck::factoryId()
|
||||
|
||||
@ -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();
|
||||
|
||||
@ -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<QString, QVariant> options { { QStringLiteral( "skipConvertFields" ), true } };
|
||||
|
||||
@ -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:
|
||||
|
||||
@ -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:
|
||||
|
||||
@ -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; }
|
||||
|
||||
@ -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<QString, QString> &templates );
|
||||
|
||||
|
||||
@ -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 );
|
||||
}
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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<QgsMapLayer *> 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 );
|
||||
|
||||
|
||||
@ -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();
|
||||
|
||||
@ -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 );
|
||||
|
||||
@ -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();
|
||||
|
||||
@ -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();
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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();
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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(
|
||||
|
||||
@ -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();
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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" ) )
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 )
|
||||
{
|
||||
|
||||
@ -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();
|
||||
|
||||
@ -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:
|
||||
|
||||
|
||||
@ -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 )
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -333,7 +333,7 @@ class CORE_EXPORT QgsClassificationMethod SIP_ABSTRACT
|
||||
QList<QgsClassificationRange> breaksToClasses( const QList<double> &breaks ) const;
|
||||
|
||||
// implementation properties (set by initialization)
|
||||
MethodProperties mFlags = nullptr;
|
||||
MethodProperties mFlags = MethodProperties();
|
||||
int mCodeComplexity = 1;
|
||||
|
||||
// parameters (set by setters)
|
||||
|
||||
@ -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<QgsExpressionContextScope *> 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;
|
||||
|
||||
@ -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<QgsPoint> &points, QVector<double> &bulges );
|
||||
void appendLineString( const QgsLineString &ls, QVector<QgsPoint> &points, QVector<double> &bulges );
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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:
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -128,7 +128,7 @@ int QgsLayoutItem::type() const
|
||||
|
||||
QgsLayoutItem::Flags QgsLayoutItem::itemFlags() const
|
||||
{
|
||||
return nullptr;
|
||||
return QgsLayoutItem::Flags();
|
||||
}
|
||||
|
||||
void QgsLayoutItem::setId( const QString &id )
|
||||
|
||||
@ -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();
|
||||
}
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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:
|
||||
|
||||
@ -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();
|
||||
|
||||
};
|
||||
|
||||
|
||||
@ -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 )
|
||||
|
||||
@ -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
|
||||
|
||||
@ -43,7 +43,7 @@ QString QgsProcessingProvider::svgIconPath() const
|
||||
|
||||
QgsProcessingProvider::Flags QgsProcessingProvider::flags() const
|
||||
{
|
||||
return nullptr;
|
||||
return QgsProcessingProvider::Flags();
|
||||
}
|
||||
|
||||
QString QgsProcessingProvider::helpId() const
|
||||
|
||||
@ -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<QgsAbstractDatabaseProviderConnection::TableProperty> tables( const QString &schema = QString(),
|
||||
const TableFlags &flags = nullptr ) const override;
|
||||
const TableFlags &flags = TableFlags() ) const override;
|
||||
QIcon icon() const override;
|
||||
QList<QgsVectorDataProvider::NativeType> nativeTypes() const override;
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -319,7 +319,7 @@ class QgsOgrProvider final: public QgsVectorDataProvider
|
||||
|
||||
void computeCapabilities();
|
||||
|
||||
QgsVectorDataProvider::Capabilities mCapabilities = nullptr;
|
||||
QgsVectorDataProvider::Capabilities mCapabilities = QgsVectorDataProvider::Capabilities();
|
||||
|
||||
bool doInitialActionsForEdition();
|
||||
|
||||
|
||||
@ -517,7 +517,7 @@ class CORE_EXPORT QgsAbstractDatabaseProviderConnection : public QgsAbstractProv
|
||||
* \throws QgsProviderConnectionException
|
||||
* \note Not available in Python bindings
|
||||
*/
|
||||
virtual QList<QgsAbstractDatabaseProviderConnection::TableProperty> tables( const QString &schema = QString(), const QgsAbstractDatabaseProviderConnection::TableFlags &flags = nullptr ) const SIP_SKIP;
|
||||
virtual QList<QgsAbstractDatabaseProviderConnection::TableProperty> 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;
|
||||
|
||||
};
|
||||
|
||||
@ -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 )
|
||||
|
||||
@ -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 )
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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();
|
||||
}
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -5402,7 +5402,7 @@ bool QgsVectorLayer::setDependencies( const QSet<QgsMapLayerDependency> &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 );
|
||||
|
||||
|
||||
@ -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 );
|
||||
|
||||
@ -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 )
|
||||
|
||||
@ -469,6 +469,7 @@ bool QgsColorRampShader::shade( double value, int *returnRedValue, int *returnGr
|
||||
}
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
bool QgsColorRampShader::shade( double redValue, double greenValue,
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -485,7 +485,7 @@ QgsFeatureRenderer::Capabilities QgsInvertedPolygonRenderer::capabilities()
|
||||
{
|
||||
if ( !mSubRenderer )
|
||||
{
|
||||
return nullptr;
|
||||
return Capabilities();
|
||||
}
|
||||
return mSubRenderer->capabilities();
|
||||
}
|
||||
|
||||
@ -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 );
|
||||
|
||||
@ -238,7 +238,7 @@ QgsFeatureRenderer::Capabilities QgsPointDistanceRenderer::capabilities()
|
||||
{
|
||||
if ( !mRenderer )
|
||||
{
|
||||
return nullptr;
|
||||
return Capabilities();
|
||||
}
|
||||
return mRenderer->capabilities();
|
||||
}
|
||||
|
||||
@ -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();
|
||||
|
||||
|
||||
@ -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();
|
||||
|
||||
@ -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();
|
||||
}
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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() )
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
@ -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();
|
||||
|
||||
@ -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 );
|
||||
|
||||
@ -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:
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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
|
||||
{
|
||||
|
||||
@ -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() );
|
||||
}
|
||||
|
||||
@ -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.
|
||||
|
||||
@ -72,7 +72,7 @@ QgsModelComponentGraphicItem::QgsModelComponentGraphicItem( QgsProcessingModelCo
|
||||
|
||||
QgsModelComponentGraphicItem::Flags QgsModelComponentGraphicItem::flags() const
|
||||
{
|
||||
return nullptr;
|
||||
return QgsModelComponentGraphicItem::Flags();
|
||||
}
|
||||
|
||||
QgsModelComponentGraphicItem::~QgsModelComponentGraphicItem() = default;
|
||||
|
||||
@ -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:
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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
|
||||
{
|
||||
|
||||
@ -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() );
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user