sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Change FilterType to enum class + rename values to FilterXXX

Browse Source
This commit is contained in:
Martin Dobias 2019-06-25 14:53:56 +02:00
parent 5f0558915f
commit aead182b21
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
python/core/auto_generated/qgsprovidermetadata.sip.in
View File

@ -88,12 +88,12 @@ Cleanup the provider
.. versionadded:: 3.10
%End
enum FilterType
enum class FilterType
{
VectorFilter,
RasterFilter,
MeshFilter,
MeshDatasetFilter
FilterVector,
FilterRaster,
FilterMesh,
FilterMeshDataset
};
virtual QString filters( FilterType type );

2
src/core/providers/gdal/qgsgdalprovider.cpp
View File

@ -3015,7 +3015,7 @@ bool QgsGdalProvider::remove()
*/
QString QgsGdalProviderMetadata::filters( FilterType type )
{
if ( type == QgsProviderMetadata::RasterFilter )
if ( type == QgsProviderMetadata::FilterType::FilterRaster )
{
QString fileFiltersString;
QStringList exts;

2
src/core/providers/ogr/qgsogrprovider.cpp
View File

@ -6608,7 +6608,7 @@ QgsOgrProviderMetadata::QgsOgrProviderMetadata()
QString QgsOgrProviderMetadata::filters( FilterType type )
{
if ( type == QgsProviderMetadata::VectorFilter )
if ( type == QgsProviderMetadata::FilterType::FilterVector )
{
return QgsOgrProviderUtils::fileVectorFilters();
}

10
src/core/qgsprovidermetadata.h
View File

@ -135,12 +135,12 @@ class CORE_EXPORT QgsProviderMetadata
* Type of file filters
* \since QGIS 3.10
*/
enum FilterType
enum class FilterType
{
VectorFilter = 1,
RasterFilter,
MeshFilter,
MeshDatasetFilter
FilterVector = 1,
FilterRaster,
FilterMesh,
FilterMeshDataset
};
/**

8
src/core/qgsproviderregistry.cpp
View File

@ -188,7 +188,7 @@ void QgsProviderRegistry::init()
QgsProviderMetadata *meta = it->second;
// now get vector file filters, if any
QString fileVectorFilters = meta->filters( QgsProviderMetadata::VectorFilter );
QString fileVectorFilters = meta->filters( QgsProviderMetadata::FilterVector );
if ( !fileVectorFilters.isEmpty() )
{
mVectorFileFilters += fileVectorFilters;
@ -196,7 +196,7 @@ void QgsProviderRegistry::init()
}
// now get raster file filters, if any
QString fileRasterFilters = meta->filters( QgsProviderMetadata::RasterFilter );
QString fileRasterFilters = meta->filters( QgsProviderMetadata::FilterRaster );
if ( !fileRasterFilters.isEmpty() )
{
QgsDebugMsg( "raster filters: " + fileRasterFilters );
@ -205,7 +205,7 @@ void QgsProviderRegistry::init()
}
// now get mesh file filters, if any
QString fileMeshFilters = meta->filters( QgsProviderMetadata::MeshFilter );
QString fileMeshFilters = meta->filters( QgsProviderMetadata::FilterMesh );
if ( !fileMeshFilters.isEmpty() )
{
mMeshFileFilters += fileMeshFilters;
@ -213,7 +213,7 @@ void QgsProviderRegistry::init()
}
QString fileMeshDatasetFilters = meta->filters( QgsProviderMetadata::MeshDatasetFilter );
QString fileMeshDatasetFilters = meta->filters( QgsProviderMetadata::FilterMeshDataset );
if ( !fileMeshDatasetFilters.isEmpty() )
{
mMeshDatasetFileFilters += fileMeshDatasetFilters;

4
src/providers/mdal/qgsmdalprovider.cpp
View File

@ -587,14 +587,14 @@ QList<QgsSourceSelectProvider *> QgsMdalProviderGuiMetadata::sourceSelectProvide
QString QgsMdalProviderMetadata::filters( FilterType type )
{
if ( type == QgsProviderMetadata::MeshFilter )
if ( type == QgsProviderMetadata::FilterType::FilterMesh )
{
QString fileMeshFiltersString;
QString fileMeshDatasetFiltersString;
QgsMdalProvider::fileMeshFilters( fileMeshFiltersString, fileMeshDatasetFiltersString );
return fileMeshFiltersString;
}
else if ( type == QgsProviderMetadata::MeshDatasetFilter )
else if ( type == QgsProviderMetadata::FilterType::FilterMeshDataset )
{
QString fileMeshFiltersString;
QString fileMeshDatasetFiltersString;