From 515ce71df2d2daa793fbd0eddb3aa820dd46e0dc Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Thu, 15 Dec 2022 08:02:16 +1000 Subject: [PATCH] Remove unused enum --- python/core/auto_generated/raster/qgsraster.sip.in | 7 ------- src/core/providers/gdal/qgsgdalprovider.cpp | 3 --- src/core/raster/qgsraster.h | 8 -------- 3 files changed, 18 deletions(-) diff --git a/python/core/auto_generated/raster/qgsraster.sip.in b/python/core/auto_generated/raster/qgsraster.sip.in index b15ad3a86e1..0fed0ac3212 100644 --- a/python/core/auto_generated/raster/qgsraster.sip.in +++ b/python/core/auto_generated/raster/qgsraster.sip.in @@ -51,13 +51,6 @@ Raster namespace. IdentifyFormatFeature, }; - enum RasterProgressType - { - ProgressHistogram, - ProgressPyramids, - ProgressStatistics - }; - enum RasterBuildPyramids { PyramidsFlagNo, diff --git a/src/core/providers/gdal/qgsgdalprovider.cpp b/src/core/providers/gdal/qgsgdalprovider.cpp index 65ee01cac60..663b3be37c8 100644 --- a/src/core/providers/gdal/qgsgdalprovider.cpp +++ b/src/core/providers/gdal/qgsgdalprovider.cpp @@ -89,7 +89,6 @@ const int MAX_CACHE_SIZE = 50; struct QgsGdalProgress { - int type; QgsGdalProvider *provider = nullptr; QgsRasterBlockFeedback *feedback = nullptr; }; @@ -1939,7 +1938,6 @@ QgsRasterHistogram QgsGdalProvider::histogram( int bandNo, QgsDebugMsgLevel( QStringLiteral( "xSize() = %1 ySize() = %2 sampleSize = %3 bApproxOK = %4" ).arg( xSize() ).arg( ySize() ).arg( sampleSize ).arg( bApproxOK ), 2 ); QgsGdalProgress myProg; - myProg.type = QgsRaster::ProgressHistogram; myProg.provider = this; myProg.feedback = feedback; @@ -2851,7 +2849,6 @@ QgsRasterBandStats QgsGdalProvider::bandStatistics( int bandNo, int stats, const double pdfMean; double pdfStdDev; QgsGdalProgress myProg; - myProg.type = QgsRaster::ProgressHistogram; myProg.provider = this; myProg.feedback = feedback; diff --git a/src/core/raster/qgsraster.h b/src/core/raster/qgsraster.h index be98d1ef7da..ae7a3b48bdd 100644 --- a/src/core/raster/qgsraster.h +++ b/src/core/raster/qgsraster.h @@ -63,14 +63,6 @@ class CORE_EXPORT QgsRaster IdentifyFormatFeature = 1 << 3, // WMS GML/JSON -> feature }; - // Progress types - enum RasterProgressType - { - ProgressHistogram = 0, - ProgressPyramids = 1, - ProgressStatistics = 2 - }; - enum RasterBuildPyramids { PyramidsFlagNo = 0,