From aead182b21146a10980ed86c6958325afc433b10 Mon Sep 17 00:00:00 2001
From: Martin Dobias <wonder.sk@gmail.com>
Date: Tue, 25 Jun 2019 14:53:56 +0200
Subject: [PATCH] Change FilterType to enum class + rename values to FilterXXX

---
 python/core/auto_generated/qgsprovidermetadata.sip.in | 10 +++++-----
 src/core/providers/gdal/qgsgdalprovider.cpp           |  2 +-
 src/core/providers/ogr/qgsogrprovider.cpp             |  2 +-
 src/core/qgsprovidermetadata.h                        | 10 +++++-----
 src/core/qgsproviderregistry.cpp                      |  8 ++++----
 src/providers/mdal/qgsmdalprovider.cpp                |  4 ++--
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/python/core/auto_generated/qgsprovidermetadata.sip.in b/python/core/auto_generated/qgsprovidermetadata.sip.in
index 264c5fa00c9..9c9651b9599 100644
--- a/python/core/auto_generated/qgsprovidermetadata.sip.in
+++ b/python/core/auto_generated/qgsprovidermetadata.sip.in
@@ -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 );
diff --git a/src/core/providers/gdal/qgsgdalprovider.cpp b/src/core/providers/gdal/qgsgdalprovider.cpp
index 59db87113a3..c8ddcd1190b 100644
--- a/src/core/providers/gdal/qgsgdalprovider.cpp
+++ b/src/core/providers/gdal/qgsgdalprovider.cpp
@@ -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;
diff --git a/src/core/providers/ogr/qgsogrprovider.cpp b/src/core/providers/ogr/qgsogrprovider.cpp
index 691eb64d707..7ca5fd9e806 100644
--- a/src/core/providers/ogr/qgsogrprovider.cpp
+++ b/src/core/providers/ogr/qgsogrprovider.cpp
@@ -6608,7 +6608,7 @@ QgsOgrProviderMetadata::QgsOgrProviderMetadata()
 
 QString QgsOgrProviderMetadata::filters( FilterType type )
 {
-  if ( type == QgsProviderMetadata::VectorFilter )
+  if ( type == QgsProviderMetadata::FilterType::FilterVector )
   {
     return QgsOgrProviderUtils::fileVectorFilters();
   }
diff --git a/src/core/qgsprovidermetadata.h b/src/core/qgsprovidermetadata.h
index 4c1c15a8530..fb1fefc9f94 100644
--- a/src/core/qgsprovidermetadata.h
+++ b/src/core/qgsprovidermetadata.h
@@ -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
     };
 
     /**
diff --git a/src/core/qgsproviderregistry.cpp b/src/core/qgsproviderregistry.cpp
index 81324acdd11..5b6365753ed 100644
--- a/src/core/qgsproviderregistry.cpp
+++ b/src/core/qgsproviderregistry.cpp
@@ -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;
diff --git a/src/providers/mdal/qgsmdalprovider.cpp b/src/providers/mdal/qgsmdalprovider.cpp
index e7882fd71f6..f9a32c1b28b 100644
--- a/src/providers/mdal/qgsmdalprovider.cpp
+++ b/src/providers/mdal/qgsmdalprovider.cpp
@@ -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;