Skip to content

Commit

Permalink
Rename 'None' enum members in public API
Browse files Browse the repository at this point in the history
These clash with the Python bindings, where the enum value
becomes unusable
  • Loading branch information
nyalldawson committed Aug 6, 2024
1 parent ad8c0aa commit 886074c
Show file tree
Hide file tree
Showing 52 changed files with 64 additions and 64 deletions.
2 changes: 1 addition & 1 deletion python/PyQt6/core/auto_additions/qgsmeshdataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
QgsMeshDatasetGroupMetadata.DataOnVertices = QgsMeshDatasetGroupMetadata.DataType.DataOnVertices
QgsMeshDatasetGroupMetadata.DataOnVolumes = QgsMeshDatasetGroupMetadata.DataType.DataOnVolumes
QgsMeshDatasetGroupMetadata.DataOnEdges = QgsMeshDatasetGroupMetadata.DataType.DataOnEdges
QgsMeshDatasetGroup.None_ = QgsMeshDatasetGroup.Type.None_
QgsMeshDatasetGroup.Unknown = QgsMeshDatasetGroup.Type.Unknown
QgsMeshDatasetGroup.Persistent = QgsMeshDatasetGroup.Type.Persistent
QgsMeshDatasetGroup.Memory = QgsMeshDatasetGroup.Type.Memory
QgsMeshDatasetGroup.Virtual = QgsMeshDatasetGroup.Type.Virtual
2 changes: 1 addition & 1 deletion python/PyQt6/core/auto_additions/qgsproviderregistry.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# The following has been generated automatically from src/core/providers/qgsproviderregistry.h
QgsProviderRegistry.None_ = QgsProviderRegistry.WidgetMode.None_
QgsProviderRegistry.Standalone = QgsProviderRegistry.WidgetMode.Standalone
QgsProviderRegistry.Embedded = QgsProviderRegistry.WidgetMode.Embedded
QgsProviderRegistry.Manager = QgsProviderRegistry.WidgetMode.Manager
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@ Abstract class that represents a dataset group

enum Type /BaseType=IntEnum/
{
None,
Unknown,
Persistent,
Memory,
Virtual,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ ogr and postgres.
enum WidgetMode /BaseType=IntEnum/
{

None,
Standalone,

Embedded,

Expand Down Expand Up @@ -203,7 +203,7 @@ If a provider does not work with paths, unmodified URI will be returned.
.. versionadded:: 3.30
%End

QWidget *createSelectionWidget( const QString &providerKey, QWidget *parent = 0, Qt::WindowFlags fl = Qt::WindowFlags(), QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::None ) /Deprecated/;
QWidget *createSelectionWidget( const QString &providerKey, QWidget *parent = 0, Qt::WindowFlags fl = Qt::WindowFlags(), QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Standalone ) /Deprecated/;
%Docstring
Returns a new widget for selecting layers from a provider.
Either the ``parent`` widget must be set or the caller becomes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ The :py:class:`QgsAbstractDbSourceSelect` class is a base class for database sou
#include "qgsabstractdbsourceselect.h"
%End
public:
QgsAbstractDbSourceSelect( QWidget *parent = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::None );
QgsAbstractDbSourceSelect( QWidget *parent = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Standalone );
%Docstring
Constructor
%End
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ Emitted when a ``message`` with ``title`` and ``level`` must be shown to the use

protected:

QgsAbstractDataSourceWidget( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::None );
QgsAbstractDataSourceWidget( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Standalone );
%Docstring
Constructor
%End
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ It is designed to be embedded in the data source manager dialog.
%End
public:

explicit QgsLayerMetadataSearchWidget( QWidget *parent = 0, Qt::WindowFlags fl = Qt::WindowFlags(), QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::None );
explicit QgsLayerMetadataSearchWidget( QWidget *parent = 0, Qt::WindowFlags fl = Qt::WindowFlags(), QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Standalone );
%Docstring
Creates a new QgsLayerMetadataSearchWidget.
%End
Expand Down
2 changes: 1 addition & 1 deletion python/PyQt6/gui/auto_generated/qgsowssourceselect.sip.in
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ layers from the WCS server to the map canvas.
QString label;
};

QgsOWSSourceSelect( const QString &service, QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::None );
QgsOWSSourceSelect( const QString &service, QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Standalone );
%Docstring
Constructor
%End
Expand Down
2 changes: 1 addition & 1 deletion python/core/auto_generated/mesh/qgsmeshdataset.sip.in
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@ Abstract class that represents a dataset group

enum Type
{
None,
Unknown,
Persistent,
Memory,
Virtual,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ ogr and postgres.
enum WidgetMode
{

None,
Standalone,

Embedded,

Expand Down Expand Up @@ -203,7 +203,7 @@ If a provider does not work with paths, unmodified URI will be returned.
.. versionadded:: 3.30
%End

QWidget *createSelectionWidget( const QString &providerKey, QWidget *parent = 0, Qt::WindowFlags fl = Qt::WindowFlags(), QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::None ) /Deprecated/;
QWidget *createSelectionWidget( const QString &providerKey, QWidget *parent = 0, Qt::WindowFlags fl = Qt::WindowFlags(), QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Standalone ) /Deprecated/;
%Docstring
Returns a new widget for selecting layers from a provider.
Either the ``parent`` widget must be set or the caller becomes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ The :py:class:`QgsAbstractDbSourceSelect` class is a base class for database sou
#include "qgsabstractdbsourceselect.h"
%End
public:
QgsAbstractDbSourceSelect( QWidget *parent = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::None );
QgsAbstractDbSourceSelect( QWidget *parent = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Standalone );
%Docstring
Constructor
%End
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ Emitted when a ``message`` with ``title`` and ``level`` must be shown to the use

protected:

QgsAbstractDataSourceWidget( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::None );
QgsAbstractDataSourceWidget( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Standalone );
%Docstring
Constructor
%End
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ It is designed to be embedded in the data source manager dialog.
%End
public:

explicit QgsLayerMetadataSearchWidget( QWidget *parent = 0, Qt::WindowFlags fl = Qt::WindowFlags(), QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::None );
explicit QgsLayerMetadataSearchWidget( QWidget *parent = 0, Qt::WindowFlags fl = Qt::WindowFlags(), QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Standalone );
%Docstring
Creates a new QgsLayerMetadataSearchWidget.
%End
Expand Down
2 changes: 1 addition & 1 deletion python/gui/auto_generated/qgsowssourceselect.sip.in
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ layers from the WCS server to the map canvas.
QString label;
};

QgsOWSSourceSelect( const QString &service, QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::None );
QgsOWSSourceSelect( const QString &service, QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Standalone );
%Docstring
Constructor
%End
Expand Down
4 changes: 2 additions & 2 deletions src/core/mesh/qgsmeshdataset.h
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,7 @@ class CORE_EXPORT QgsMeshDatasetGroup
*/
enum Type
{
None, //! Generic type used for non typed dataset group
Unknown, //! Generic type used for non typed dataset group
Persistent, //! Dataset group store in a file
Memory, //! Temporary dataset group in memory
Virtual, //! Virtual Dataset group defined by a formula
Expand Down Expand Up @@ -1065,7 +1065,7 @@ class CORE_EXPORT QgsMeshDatasetGroupTreeItem
QString mUserName;
QString mOriginalName;
QString mSourceName;
QgsMeshDatasetGroup::Type mDatasetGroupType = QgsMeshDatasetGroup::None;
QgsMeshDatasetGroup::Type mDatasetGroupType = QgsMeshDatasetGroup::Unknown;
QString mDescription;

bool mIsVector = false;
Expand Down
4 changes: 2 additions & 2 deletions src/core/providers/qgsproviderregistry.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class CORE_EXPORT QgsProviderRegistry
* as GUI for individual "Add XXX layer" buttons in the main window.
* Likely not used in live code anymore.
*/
None,
Standalone,

/**
* Used for the data source manager dialog where the widget is embedded as the main content
Expand Down Expand Up @@ -237,7 +237,7 @@ class CORE_EXPORT QgsProviderRegistry
* responsible for deleting the returned widget.
* \deprecated QGIS 3.10 - use QgsGui::sourceSelectProviderRegistry()->createDataSourceWidget() instead
*/
Q_DECL_DEPRECATED QWidget *createSelectionWidget( const QString &providerKey, QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags(), QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::None ) SIP_DEPRECATED;
Q_DECL_DEPRECATED QWidget *createSelectionWidget( const QString &providerKey, QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags(), QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Standalone ) SIP_DEPRECATED;

/**
* Returns list of data item providers of the provider
Expand Down
2 changes: 1 addition & 1 deletion src/gui/mesh/qgsmeshdatasetgrouptreeview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@ QMenu *QgsMeshDatasetGroupTreeView::createContextMenu()

switch ( item->datasetGroupType() )
{
case QgsMeshDatasetGroup::None:
case QgsMeshDatasetGroup::Unknown:
break;
case QgsMeshDatasetGroup::Persistent:
break;
Expand Down
2 changes: 1 addition & 1 deletion src/gui/providers/gdal/qgsgdalsourceselect.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class QgsGdalSourceSelect : public QgsAbstractDataSourceWidget, private Ui::QgsG

public:
//! Constructor
QgsGdalSourceSelect( QWidget *parent = nullptr, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::None );
QgsGdalSourceSelect( QWidget *parent = nullptr, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Standalone );

public slots:
//! Determines the tables the user selected and closes the dialog
Expand Down
4 changes: 2 additions & 2 deletions src/gui/providers/ogr/qgsogrdbsourceselect.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ QgsOgrDbSourceSelect::QgsOgrDbSourceSelect( const QString &theSettingsKey, const
btnSave->hide();
btnLoad->hide();

if ( widgetMode() != QgsProviderRegistry::WidgetMode::None )
if ( widgetMode() != QgsProviderRegistry::WidgetMode::Standalone )
{
mHoldDialogOpen->hide();
}
Expand Down Expand Up @@ -229,7 +229,7 @@ void QgsOgrDbSourceSelect::addButtonClicked()
Q_NOWARN_DEPRECATED_POP
emit addLayer( Qgis::LayerType::Raster, info.first, info.second, QStringLiteral( "gdal" ) );
}
if ( widgetMode() == QgsProviderRegistry::WidgetMode::None && ! mHoldDialogOpen->isChecked() )
if ( widgetMode() == QgsProviderRegistry::WidgetMode::Standalone && ! mHoldDialogOpen->isChecked() )
{
accept();
}
Expand Down
2 changes: 1 addition & 1 deletion src/gui/providers/ogr/qgsogrdbsourceselect.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class QgsOgrDbSourceSelect: public QgsAbstractDbSourceSelect
* and \a theName as string for describing the layers managed by the source select (e.g. : "GeoPackage" etc.)
* The \a extensions is a string dscribing the accepted file extensions (e.g. : "GeoPackage Database (*.gpkg *.GPKG)")
*/
QgsOgrDbSourceSelect( const QString &theOgrDriverName, const QString &theName, const QString &theExtensions, QWidget *parent = nullptr, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode theWidgetMode = QgsProviderRegistry::WidgetMode::None );
QgsOgrDbSourceSelect( const QString &theOgrDriverName, const QString &theName, const QString &theExtensions, QWidget *parent = nullptr, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode theWidgetMode = QgsProviderRegistry::WidgetMode::Standalone );

~QgsOgrDbSourceSelect() override;

Expand Down
2 changes: 1 addition & 1 deletion src/gui/providers/ogr/qgsogrsourceselect.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ QgsOgrSourceSelect::QgsOgrSourceSelect( QWidget *parent, Qt::WindowFlags fl, Qgs
setupButtons( buttonBox );
connect( buttonBox, &QDialogButtonBox::helpRequested, this, &QgsOgrSourceSelect::showHelp );

if ( mWidgetMode != QgsProviderRegistry::WidgetMode::None )
if ( mWidgetMode != QgsProviderRegistry::WidgetMode::Standalone )
{
this->layout()->setSizeConstraint( QLayout::SetNoConstraint );
}
Expand Down
4 changes: 2 additions & 2 deletions src/gui/providers/ogr/qgsogrsourceselect.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class QgsOgrSourceSelect : public QgsAbstractDataSourceWidget, private Ui::QgsOg
Q_OBJECT

public:
QgsOgrSourceSelect( QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags(), QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::None );
QgsOgrSourceSelect( QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags(), QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Standalone );
//! Opens a dialog to select a file datasource
QStringList openFile();
//! Opens a dialog to select a directory datasource
Expand All @@ -73,7 +73,7 @@ class QgsOgrSourceSelect : public QgsAbstractDataSourceWidget, private Ui::QgsOg
//! Stores the datasource type
QString mDataSourceType;
//! Embedded dialog (do not call parent's accept) and emit signals
QgsProviderRegistry::WidgetMode mWidgetMode = QgsProviderRegistry::WidgetMode::None;
QgsProviderRegistry::WidgetMode mWidgetMode = QgsProviderRegistry::WidgetMode::Standalone;

public slots:
void addButtonClicked() override;
Expand Down
2 changes: 1 addition & 1 deletion src/gui/providers/qgsabstractdbsourceselect.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class GUI_EXPORT QgsAbstractDbSourceSelect : public QgsAbstractDataSourceWidget,
Q_OBJECT
public:
//! Constructor
QgsAbstractDbSourceSelect( QWidget *parent = nullptr, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::None );
QgsAbstractDbSourceSelect( QWidget *parent = nullptr, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Standalone );

protected:
//! Sets the source model for the table and optionally a delegate
Expand Down
2 changes: 1 addition & 1 deletion src/gui/providers/qgspointcloudsourceselect.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class QgsPointCloudSourceSelect : public QgsAbstractDataSourceWidget, private Ui
//! Constructor
QgsPointCloudSourceSelect( QWidget *parent = nullptr,
Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags,
QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::None );
QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Standalone );

public slots:
//! Determines the tables the user selected and closes the dialog
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class QgsSensorThingsSourceSelect : public QgsAbstractDataSourceWidget, private
Q_OBJECT

public:
QgsSensorThingsSourceSelect( QWidget *parent = nullptr, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::None );
QgsSensorThingsSourceSelect( QWidget *parent = nullptr, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Standalone );
void addButtonClicked() override;
void setMapCanvas( QgsMapCanvas *mapCanvas ) override;

Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgsabstractdatasourcewidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ class GUI_EXPORT QgsAbstractDataSourceWidget : public QDialog
protected:

//! Constructor
QgsAbstractDataSourceWidget( QWidget *parent SIP_TRANSFERTHIS = nullptr, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::None );
QgsAbstractDataSourceWidget( QWidget *parent SIP_TRANSFERTHIS = nullptr, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Standalone );

//! Returns the widget mode
QgsProviderRegistry::WidgetMode widgetMode() const;
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgslayermetadatasearchwidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class GUI_EXPORT QgsLayerMetadataSearchWidget : public QgsAbstractDataSourceWidg
/**
* Creates a new QgsLayerMetadataSearchWidget.
*/
explicit QgsLayerMetadataSearchWidget( QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags(), QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::None );
explicit QgsLayerMetadataSearchWidget( QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags(), QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Standalone );

void setMapCanvas( QgsMapCanvas *mapCanvas ) override;

Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgsowssourceselect.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class GUI_EXPORT QgsOWSSourceSelect : public QgsAbstractDataSourceWidget, protec
};

//! Constructor
QgsOWSSourceSelect( const QString &service, QWidget *parent SIP_TRANSFERTHIS = nullptr, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::None );
QgsOWSSourceSelect( const QString &service, QWidget *parent SIP_TRANSFERTHIS = nullptr, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Standalone );

//! Triggered when the provider's connections need to be refreshed
void refresh() override;
Expand Down
2 changes: 1 addition & 1 deletion src/gui/tiledscene/qgstiledscenesourceselect.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class QgsTiledSceneSourceSelect : public QgsAbstractDataSourceWidget, private Ui

public:
//! Constructor
QgsTiledSceneSourceSelect( QWidget *parent = nullptr, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::None );
QgsTiledSceneSourceSelect( QWidget *parent = nullptr, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Standalone );

//! Determines the layers the user selected
void addButtonClicked() override;
Expand Down
2 changes: 1 addition & 1 deletion src/gui/vectortile/qgsvectortilesourceselect.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class QgsVectorTileSourceSelect : public QgsAbstractDataSourceWidget, private Ui

public:
//! Constructor
QgsVectorTileSourceSelect( QWidget *parent = nullptr, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::None );
QgsVectorTileSourceSelect( QWidget *parent = nullptr, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Standalone );

//! Determines the layers the user selected
void addButtonClicked() override;
Expand Down
2 changes: 1 addition & 1 deletion src/providers/arcgisrest/qgsarcgisrestsourceselect.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class QgsArcGisRestSourceSelect : public QgsAbstractDataSourceWidget, protected
public:

//! Constructor
QgsArcGisRestSourceSelect( QWidget *parent, Qt::WindowFlags fl, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::None );
QgsArcGisRestSourceSelect( QWidget *parent, Qt::WindowFlags fl, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Standalone );

//! Destructor
~QgsArcGisRestSourceSelect() override;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ void QgsDelimitedTextSourceSelect::addButtonClicked()
mFileWidget->setFilePath( QString() );
txtLayerName->setText( QString() );

if ( widgetMode() == QgsProviderRegistry::WidgetMode::None )
if ( widgetMode() == QgsProviderRegistry::WidgetMode::Standalone )
{
accept();
}
Expand Down
2 changes: 1 addition & 1 deletion src/providers/delimitedtext/qgsdelimitedtextsourceselect.h
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class QgsDelimitedTextSourceSelect : public QgsAbstractDataSourceWidget, private
Q_OBJECT

public:
QgsDelimitedTextSourceSelect( QWidget *parent = nullptr, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::None );
QgsDelimitedTextSourceSelect( QWidget *parent = nullptr, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Standalone );

private:
bool loadDelimitedFileDefinition();
Expand Down
Loading

0 comments on commit 886074c

Please sign in to comment.