Skip to content
Permalink
Browse files

Fix all remaining Qt QFlags deprecated constructor warnings

  • Loading branch information
nyalldawson committed Oct 2, 2020
1 parent 09f84eb commit ab6bbfda1dbcb21079bec1fb9942e907f5eaab1b
Showing with 221 additions and 226 deletions.
  1. +1 −1 python/core/auto_generated/geometry/qgspoint.sip.in
  2. +1 −1 python/core/auto_generated/symbology/qgssymbol.sip.in
  3. +1 −1 python/gui/auto_generated/effects/qgseffectstackpropertieswidget.sip.in
  4. +4 −4 python/gui/auto_generated/layout/qgslayoutviewrubberband.sip.in
  5. +1 −1 python/gui/auto_generated/qgsoptionsdialogbase.sip.in
  6. +1 −1 python/gui/auto_generated/qgsrasterlayersaveasdialog.sip.in
  7. +1 −1 python/gui/auto_generated/qgssublayersdialog.sip.in
  8. +1 −1 python/gui/auto_generated/symbology/qgsdashspacedialog.sip.in
  9. +1 −1 src/analysis/processing/qgsalgorithmdissolve.h
  10. +1 −1 src/analysis/processing/qgsalgorithmextractzmvalues.cpp
  11. +1 −1 src/analysis/processing/qgsalgorithmzonalstatistics.cpp
  12. +1 −1 src/analysis/processing/qgsalgorithmzonalstatisticsfeaturebased.cpp
  13. +1 −1 src/analysis/vector/geometry_checker/qgsgeometrycheck.cpp
  14. +1 −1 src/analysis/vector/geometry_checker/qgsgeometryselfintersectioncheck.cpp
  15. +1 −1 src/app/3d/qgs3dmeasuredialog.h
  16. +3 −3 src/app/browser/qgsinbuiltdataitemproviders.cpp
  17. +1 −1 src/app/dwg/qgsdwgimportdialog.h
  18. +1 −1 src/app/georeferencer/qgsgeorefmainwindow.h
  19. +1 −1 src/app/labeling/qgslabelpropertydialog.h
  20. +1 −1 src/app/layout/qgslayoutmanagerdialog.h
  21. +1 −1 src/app/layout/qgsreportsectionmodel.cpp
  22. +1 −1 src/app/mesh/qgsmeshcalculatordialog.h
  23. +4 −4 src/app/qgisapp.cpp
  24. +1 −1 src/app/qgsannotationwidget.h
  25. +1 −1 src/app/qgsappscreenshots.h
  26. +1 −1 src/app/qgscustomprojectiondialog.h
  27. +2 −2 src/app/qgsdatumtransformtablewidget.cpp
  28. +1 −1 src/app/qgsdisplayangle.h
  29. +1 −1 src/app/qgsdxfexportdialog.cpp
  30. +1 −1 src/app/qgsdxfexportdialog.h
  31. +1 −1 src/app/qgsformannotationdialog.h
  32. +1 −1 src/app/qgshtmlannotationdialog.h
  33. +1 −1 src/app/qgsidentifyresultsdialog.h
  34. +4 −4 src/app/qgslayercapabilitiesmodel.cpp
  35. +1 −1 src/app/qgsmapsavedialog.cpp
  36. +1 −1 src/app/qgsmeasuredialog.h
  37. +1 −1 src/app/qgsmergeattributesdialog.h
  38. +1 −1 src/app/qgsoptions.cpp
  39. +1 −1 src/app/qgsprojectlayergroupdialog.h
  40. +1 −1 src/app/qgsrastercalcdialog.h
  41. +1 −1 src/app/qgsselectbyformdialog.h
  42. +3 −3 src/app/qgsstatisticalsummarydockwidget.cpp
  43. +1 −1 src/app/qgssvgannotationdialog.h
  44. +1 −1 src/app/qgstextannotationdialog.h
  45. +2 −2 src/core/auth/qgsauthmanager.cpp
  46. +2 −4 src/core/auth/qgsauthmethod.h
  47. +1 −1 src/core/classification/qgsclassificationmethod.h
  48. +2 −2 src/core/dxf/qgsdxfexport.cpp
  49. +1 −1 src/core/dxf/qgsdxfexport.h
  50. +1 −1 src/core/geometry/qgspoint.h
  51. +1 −1 src/core/labeling/qgslabelfeature.h
  52. +1 −1 src/core/labeling/qgslabelingenginesettings.cpp
  53. +1 −1 src/core/layout/qgslayoutexporter.cpp
  54. +1 −1 src/core/layout/qgslayoutitem.cpp
  55. +1 −1 src/core/layout/qgslayoutitemmap.cpp
  56. +1 −1 src/core/layout/qgslayoutitemmap.h
  57. +2 −2 src/core/layout/qgslayoutitemmapgrid.cpp
  58. +1 −1 src/core/layout/qgslayoutmodel.h
  59. +1 −1 src/core/locator/qgslocatorfilter.cpp
  60. +1 −1 src/core/processing/qgsprocessingalgorithm.cpp
  61. +1 −1 src/core/processing/qgsprocessingprovider.cpp
  62. +1 −1 src/core/providers/ogr/qgsgeopackageproviderconnection.h
  63. +2 −2 src/core/providers/ogr/qgsogrprovider.cpp
  64. +1 −1 src/core/providers/ogr/qgsogrprovider.h
  65. +3 −3 src/core/qgsabstractdatabaseproviderconnection.h
  66. +1 −1 src/core/qgsbookmarkmodel.cpp
  67. +0 −5 src/core/qgsfeaturerequest.cpp
  68. +1 −1 src/core/qgsfeaturerequest.h
  69. +1 −1 src/core/qgsmaplayermodel.cpp
  70. +1 −1 src/core/qgspaintenginehack.cpp
  71. +2 −2 src/core/qgsspatialindex.cpp
  72. +1 −1 src/core/qgsvectordataprovider.cpp
  73. +3 −3 src/core/qgsvectorfilewriter.cpp
  74. +3 −3 src/core/qgsvectorlayer.cpp
  75. +1 −1 src/core/qgsvectorlayercache.cpp
  76. +1 −1 src/core/qgsvectorlayertemporalproperties.cpp
  77. +1 −0 src/core/raster/qgscolorrampshader.cpp
  78. +1 −1 src/core/raster/qgsrasterlayertemporalproperties.cpp
  79. +1 −1 src/core/scalebar/qgsscalebarrenderer.cpp
  80. +1 −1 src/core/symbology/qgsinvertedpolygonrenderer.cpp
  81. +2 −2 src/core/symbology/qgslinesymbollayer.cpp
  82. +1 −1 src/core/symbology/qgspointdistancerenderer.cpp
  83. +1 −1 src/core/symbology/qgssymbol.h
  84. +2 −2 src/core/symbology/qgssymbollayerutils.cpp
  85. +3 −3 src/gui/attributetable/qgsfeaturefilterwidget.cpp
  86. +1 −1 src/gui/effects/qgseffectstackpropertieswidget.h
  87. +1 −1 src/gui/labeling/qgslabelinggui.cpp
  88. +1 −1 src/gui/layout/qgsgeopdflayertreemodel.cpp
  89. +1 −1 src/gui/layout/qgslayoutattributeselectiondialog.h
  90. +3 −3 src/gui/layout/qgslayoutguiutils.cpp
  91. +4 −4 src/gui/layout/qgslayoutviewrubberband.h
  92. +1 −1 src/gui/layout/qgslayoutviewtool.h
  93. +2 −2 src/gui/layout/qgslayoutviewtoolselect.cpp
  94. +2 −2 src/gui/layout/qgslayoutviewtoolzoom.cpp
  95. +2 −2 src/gui/ogr/qgsvectorlayersaveasdialog.h
  96. +1 −1 src/gui/processing/models/qgsmodelcomponentgraphicitem.cpp
  97. +2 −2 src/gui/processing/models/qgsmodelviewrubberband.h
  98. +1 −1 src/gui/processing/models/qgsmodelviewtool.h
  99. +2 −2 src/gui/processing/models/qgsmodelviewtoolselect.cpp
  100. +2 −2 src/gui/processing/models/qgsmodelviewtoolzoom.cpp
  101. +1 −1 src/gui/processing/qgsprocessingmaplayercombobox.cpp
  102. +1 −1 src/gui/processing/qgsprocessingoutputdestinationwidget.cpp
  103. +1 −1 src/gui/processing/qgsprocessingtoolboxmodel.cpp
  104. +1 −1 src/gui/processing/qgsprocessingtoolboxmodel.h
  105. +5 −5 src/gui/processing/qgsprocessingwidgetwrapperimpl.cpp
  106. +1 −1 src/gui/providers/ogr/qgsogrsourceselect.h
  107. +1 −1 src/gui/qgsadvanceddigitizingdockwidget.cpp
  108. +1 −1 src/gui/qgsadvanceddigitizingdockwidget.h
  109. +1 −1 src/gui/qgscolorbutton.cpp
  110. +1 −1 src/gui/qgscolordialog.cpp
  111. +1 −1 src/gui/qgsdatumtransformdialog.cpp
  112. +1 −1 src/gui/qgsdatumtransformdialog.h
  113. +1 −1 src/gui/qgsgui.cpp
  114. +1 −1 src/gui/qgsguiutils.h
  115. +2 −2 src/gui/qgsmaplayeractionregistry.h
  116. +1 −1 src/gui/qgsoptionsdialogbase.h
  117. +1 −1 src/gui/qgsrasterlayersaveasdialog.h
  118. +1 −1 src/gui/qgssublayersdialog.h
  119. +1 −1 src/gui/qgssymbolbutton.cpp
  120. +2 −1 src/gui/qgstablewidgetitem.cpp
  121. +1 −1 src/gui/symbology/qgscptcitycolorrampdialog.cpp
  122. +1 −1 src/gui/symbology/qgsdashspacedialog.h
  123. +1 −1 src/gui/vector/qgsattributesformproperties.cpp
  124. +1 −1 src/gui/vector/qgsjoindialog.h
  125. +1 −1 src/gui/vector/qgswmsdimensiondialog.h
  126. +1 −1 src/native/qgsnative.cpp
  127. +1 −1 src/plugins/offline_editing/offline_editing_plugin_gui.h
  128. +1 −1 src/plugins/offline_editing/offline_editing_progress_dialog.h
  129. +1 −1 src/providers/arcgisrest/qgsafsdataitems.cpp
  130. +1 −1 src/providers/arcgisrest/qgsamsdataitems.cpp
  131. +1 −1 src/providers/mssql/qgsmssqldataitems.cpp
  132. +1 −1 src/providers/mssql/qgsmssqlproviderconnection.h
  133. +1 −1 src/providers/postgres/qgspostgresdataitemguiprovider.cpp
  134. +1 −1 src/providers/postgres/qgspostgresprovider.h
  135. +1 −1 src/providers/postgres/qgspostgresproviderconnection.h
  136. +1 −1 src/providers/spatialite/qgsspatialitedataitems.cpp
  137. +1 −1 src/providers/spatialite/qgsspatialiteprovider.h
  138. +1 −1 src/providers/spatialite/qgsspatialiteproviderconnection.h
  139. +1 −1 src/providers/wcs/qgswcsdataitems.cpp
  140. +1 −1 src/providers/wfs/qgswfsdataitems.cpp
  141. +1 −1 src/providers/wfs/qgswfsprovider.h
  142. +1 −1 src/providers/wms/qgstilescalewidget.h
  143. +1 −1 src/providers/wms/qgswmsdataitemguiproviders.cpp
  144. +1 −1 src/providers/wms/qgswmtsdimensions.h
  145. +1 −1 src/server/services/wms/qgswmsrenderer.cpp
  146. +11 −11 tests/src/analysis/testqgsprocessing.cpp
  147. +1 −1 tests/src/core/testqgslayoutcontext.cpp
  148. +1 −1 tests/src/core/testqgslayoutmodel.cpp
  149. +2 −2 tests/src/core/testqgslayoututils.cpp
  150. +2 −2 tests/src/core/testqgsstatisticalsummary.cpp
  151. +1 −1 tests/src/core/testqgstaskmanager.cpp
  152. +2 −2 tests/src/gui/testprocessinggui.cpp
  153. +1 −1 tests/src/gui/testqgsdatumtransformdialog.cpp
  154. +4 −4 tests/src/gui/testqgsnewdatabasetablewidget.cpp
  155. +5 −5 tests/src/gui/testqgsprocessingmodel.cpp
@@ -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 &currentCrs,
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 &parameters, 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 &param
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 &parameter
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;

0 comments on commit ab6bbfd

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