Add missing enum class monkey patching

nyalldawson · nyalldawson · commit e0af537c8781 · 2025-08-01T06:21:05.000+10:00
Fix accidental API break introduced by qgis#61451
diff --git a/python/PyQt6/analysis/auto_additions/qgskde.py b/python/PyQt6/analysis/auto_additions/qgskde.py
@@ -68,11 +68,21 @@
 """
 # --
 # monkey patching scoped based enum
-QgsKernelDensityEstimation.Result.Success.__doc__ = "Operation completed successfully"
-QgsKernelDensityEstimation.Result.DriverError.__doc__ = "Could not open the driver for the specified format"
-QgsKernelDensityEstimation.Result.InvalidParameters.__doc__ = "Input parameters were not valid"
-QgsKernelDensityEstimation.Result.FileCreationError.__doc__ = "Error creating output file"
-QgsKernelDensityEstimation.Result.RasterIoError.__doc__ = "Error writing to raster"
+QgsKernelDensityEstimation.Success = QgsKernelDensityEstimation.Result.Success
+QgsKernelDensityEstimation.Success.is_monkey_patched = True
+QgsKernelDensityEstimation.Success.__doc__ = "Operation completed successfully"
+QgsKernelDensityEstimation.DriverError = QgsKernelDensityEstimation.Result.DriverError
+QgsKernelDensityEstimation.DriverError.is_monkey_patched = True
+QgsKernelDensityEstimation.DriverError.__doc__ = "Could not open the driver for the specified format"
+QgsKernelDensityEstimation.InvalidParameters = QgsKernelDensityEstimation.Result.InvalidParameters
+QgsKernelDensityEstimation.InvalidParameters.is_monkey_patched = True
+QgsKernelDensityEstimation.InvalidParameters.__doc__ = "Input parameters were not valid"
+QgsKernelDensityEstimation.FileCreationError = QgsKernelDensityEstimation.Result.FileCreationError
+QgsKernelDensityEstimation.FileCreationError.is_monkey_patched = True
+QgsKernelDensityEstimation.FileCreationError.__doc__ = "Error creating output file"
+QgsKernelDensityEstimation.RasterIoError = QgsKernelDensityEstimation.Result.RasterIoError
+QgsKernelDensityEstimation.RasterIoError.is_monkey_patched = True
+QgsKernelDensityEstimation.RasterIoError.__doc__ = "Error writing to raster"
 QgsKernelDensityEstimation.Result.__doc__ = """Result of operation
 
 * ``Success``: Operation completed successfully
diff --git a/python/PyQt6/analysis/auto_additions/qgsrastercalculator.py b/python/PyQt6/analysis/auto_additions/qgsrastercalculator.py
@@ -1,13 +1,29 @@
 # The following has been generated automatically from src/analysis/raster/qgsrastercalculator.h
 # monkey patching scoped based enum
-QgsRasterCalculator.Result.Success.__doc__ = "Calculation successful"
-QgsRasterCalculator.Result.CreateOutputError.__doc__ = "Error creating output data file"
-QgsRasterCalculator.Result.InputLayerError.__doc__ = "Error reading input layer"
-QgsRasterCalculator.Result.Canceled.__doc__ = "User canceled calculation"
-QgsRasterCalculator.Result.ParserError.__doc__ = "Error parsing formula"
-QgsRasterCalculator.Result.MemoryError.__doc__ = "Error allocating memory for result"
-QgsRasterCalculator.Result.BandError.__doc__ = "Invalid band number for input"
-QgsRasterCalculator.Result.CalculationError.__doc__ = "Error occurred while performing calculation"
+QgsRasterCalculator.Success = QgsRasterCalculator.Result.Success
+QgsRasterCalculator.Success.is_monkey_patched = True
+QgsRasterCalculator.Success.__doc__ = "Calculation successful"
+QgsRasterCalculator.CreateOutputError = QgsRasterCalculator.Result.CreateOutputError
+QgsRasterCalculator.CreateOutputError.is_monkey_patched = True
+QgsRasterCalculator.CreateOutputError.__doc__ = "Error creating output data file"
+QgsRasterCalculator.InputLayerError = QgsRasterCalculator.Result.InputLayerError
+QgsRasterCalculator.InputLayerError.is_monkey_patched = True
+QgsRasterCalculator.InputLayerError.__doc__ = "Error reading input layer"
+QgsRasterCalculator.Canceled = QgsRasterCalculator.Result.Canceled
+QgsRasterCalculator.Canceled.is_monkey_patched = True
+QgsRasterCalculator.Canceled.__doc__ = "User canceled calculation"
+QgsRasterCalculator.ParserError = QgsRasterCalculator.Result.ParserError
+QgsRasterCalculator.ParserError.is_monkey_patched = True
+QgsRasterCalculator.ParserError.__doc__ = "Error parsing formula"
+QgsRasterCalculator.MemoryError = QgsRasterCalculator.Result.MemoryError
+QgsRasterCalculator.MemoryError.is_monkey_patched = True
+QgsRasterCalculator.MemoryError.__doc__ = "Error allocating memory for result"
+QgsRasterCalculator.BandError = QgsRasterCalculator.Result.BandError
+QgsRasterCalculator.BandError.is_monkey_patched = True
+QgsRasterCalculator.BandError.__doc__ = "Invalid band number for input"
+QgsRasterCalculator.CalculationError = QgsRasterCalculator.Result.CalculationError
+QgsRasterCalculator.CalculationError.is_monkey_patched = True
+QgsRasterCalculator.CalculationError.__doc__ = "Error occurred while performing calculation"
 QgsRasterCalculator.Result.__doc__ = """Result of the calculation
 
 * ``Success``: Calculation successful
diff --git a/python/PyQt6/analysis/auto_additions/qgstininterpolator.py b/python/PyQt6/analysis/auto_additions/qgstininterpolator.py
@@ -1,7 +1,11 @@
 # The following has been generated automatically from src/analysis/interpolation/qgstininterpolator.h
 # monkey patching scoped based enum
-QgsTinInterpolator.TinInterpolation.Linear.__doc__ = "Linear interpolation"
-QgsTinInterpolator.TinInterpolation.CloughTocher.__doc__ = "Clough-Tocher interpolation"
+QgsTinInterpolator.Linear = QgsTinInterpolator.TinInterpolation.Linear
+QgsTinInterpolator.Linear.is_monkey_patched = True
+QgsTinInterpolator.Linear.__doc__ = "Linear interpolation"
+QgsTinInterpolator.CloughTocher = QgsTinInterpolator.TinInterpolation.CloughTocher
+QgsTinInterpolator.CloughTocher.is_monkey_patched = True
+QgsTinInterpolator.CloughTocher.__doc__ = "Clough-Tocher interpolation"
 QgsTinInterpolator.TinInterpolation.__doc__ = """Indicates the type of interpolation to be performed
 
 * ``Linear``: Linear interpolation
diff --git a/python/analysis/auto_additions/qgskde.py b/python/analysis/auto_additions/qgskde.py
@@ -68,11 +68,21 @@
 """
 # --
 # monkey patching scoped based enum
-QgsKernelDensityEstimation.Result.Success.__doc__ = "Operation completed successfully"
-QgsKernelDensityEstimation.Result.DriverError.__doc__ = "Could not open the driver for the specified format"
-QgsKernelDensityEstimation.Result.InvalidParameters.__doc__ = "Input parameters were not valid"
-QgsKernelDensityEstimation.Result.FileCreationError.__doc__ = "Error creating output file"
-QgsKernelDensityEstimation.Result.RasterIoError.__doc__ = "Error writing to raster"
+QgsKernelDensityEstimation.Success = QgsKernelDensityEstimation.Result.Success
+QgsKernelDensityEstimation.Success.is_monkey_patched = True
+QgsKernelDensityEstimation.Success.__doc__ = "Operation completed successfully"
+QgsKernelDensityEstimation.DriverError = QgsKernelDensityEstimation.Result.DriverError
+QgsKernelDensityEstimation.DriverError.is_monkey_patched = True
+QgsKernelDensityEstimation.DriverError.__doc__ = "Could not open the driver for the specified format"
+QgsKernelDensityEstimation.InvalidParameters = QgsKernelDensityEstimation.Result.InvalidParameters
+QgsKernelDensityEstimation.InvalidParameters.is_monkey_patched = True
+QgsKernelDensityEstimation.InvalidParameters.__doc__ = "Input parameters were not valid"
+QgsKernelDensityEstimation.FileCreationError = QgsKernelDensityEstimation.Result.FileCreationError
+QgsKernelDensityEstimation.FileCreationError.is_monkey_patched = True
+QgsKernelDensityEstimation.FileCreationError.__doc__ = "Error creating output file"
+QgsKernelDensityEstimation.RasterIoError = QgsKernelDensityEstimation.Result.RasterIoError
+QgsKernelDensityEstimation.RasterIoError.is_monkey_patched = True
+QgsKernelDensityEstimation.RasterIoError.__doc__ = "Error writing to raster"
 QgsKernelDensityEstimation.Result.__doc__ = """Result of operation
 
 * ``Success``: Operation completed successfully
diff --git a/python/analysis/auto_additions/qgsrastercalculator.py b/python/analysis/auto_additions/qgsrastercalculator.py
@@ -1,13 +1,29 @@
 # The following has been generated automatically from src/analysis/raster/qgsrastercalculator.h
 # monkey patching scoped based enum
-QgsRasterCalculator.Result.Success.__doc__ = "Calculation successful"
-QgsRasterCalculator.Result.CreateOutputError.__doc__ = "Error creating output data file"
-QgsRasterCalculator.Result.InputLayerError.__doc__ = "Error reading input layer"
-QgsRasterCalculator.Result.Canceled.__doc__ = "User canceled calculation"
-QgsRasterCalculator.Result.ParserError.__doc__ = "Error parsing formula"
-QgsRasterCalculator.Result.MemoryError.__doc__ = "Error allocating memory for result"
-QgsRasterCalculator.Result.BandError.__doc__ = "Invalid band number for input"
-QgsRasterCalculator.Result.CalculationError.__doc__ = "Error occurred while performing calculation"
+QgsRasterCalculator.Success = QgsRasterCalculator.Result.Success
+QgsRasterCalculator.Success.is_monkey_patched = True
+QgsRasterCalculator.Success.__doc__ = "Calculation successful"
+QgsRasterCalculator.CreateOutputError = QgsRasterCalculator.Result.CreateOutputError
+QgsRasterCalculator.CreateOutputError.is_monkey_patched = True
+QgsRasterCalculator.CreateOutputError.__doc__ = "Error creating output data file"
+QgsRasterCalculator.InputLayerError = QgsRasterCalculator.Result.InputLayerError
+QgsRasterCalculator.InputLayerError.is_monkey_patched = True
+QgsRasterCalculator.InputLayerError.__doc__ = "Error reading input layer"
+QgsRasterCalculator.Canceled = QgsRasterCalculator.Result.Canceled
+QgsRasterCalculator.Canceled.is_monkey_patched = True
+QgsRasterCalculator.Canceled.__doc__ = "User canceled calculation"
+QgsRasterCalculator.ParserError = QgsRasterCalculator.Result.ParserError
+QgsRasterCalculator.ParserError.is_monkey_patched = True
+QgsRasterCalculator.ParserError.__doc__ = "Error parsing formula"
+QgsRasterCalculator.MemoryError = QgsRasterCalculator.Result.MemoryError
+QgsRasterCalculator.MemoryError.is_monkey_patched = True
+QgsRasterCalculator.MemoryError.__doc__ = "Error allocating memory for result"
+QgsRasterCalculator.BandError = QgsRasterCalculator.Result.BandError
+QgsRasterCalculator.BandError.is_monkey_patched = True
+QgsRasterCalculator.BandError.__doc__ = "Invalid band number for input"
+QgsRasterCalculator.CalculationError = QgsRasterCalculator.Result.CalculationError
+QgsRasterCalculator.CalculationError.is_monkey_patched = True
+QgsRasterCalculator.CalculationError.__doc__ = "Error occurred while performing calculation"
 QgsRasterCalculator.Result.__doc__ = """Result of the calculation
 
 * ``Success``: Calculation successful
diff --git a/python/analysis/auto_additions/qgstininterpolator.py b/python/analysis/auto_additions/qgstininterpolator.py
@@ -1,7 +1,11 @@
 # The following has been generated automatically from src/analysis/interpolation/qgstininterpolator.h
 # monkey patching scoped based enum
-QgsTinInterpolator.TinInterpolation.Linear.__doc__ = "Linear interpolation"
-QgsTinInterpolator.TinInterpolation.CloughTocher.__doc__ = "Clough-Tocher interpolation"
+QgsTinInterpolator.Linear = QgsTinInterpolator.TinInterpolation.Linear
+QgsTinInterpolator.Linear.is_monkey_patched = True
+QgsTinInterpolator.Linear.__doc__ = "Linear interpolation"
+QgsTinInterpolator.CloughTocher = QgsTinInterpolator.TinInterpolation.CloughTocher
+QgsTinInterpolator.CloughTocher.is_monkey_patched = True
+QgsTinInterpolator.CloughTocher.__doc__ = "Clough-Tocher interpolation"
 QgsTinInterpolator.TinInterpolation.__doc__ = """Indicates the type of interpolation to be performed
 
 * ``Linear``: Linear interpolation
diff --git a/src/analysis/interpolation/qgstininterpolator.h b/src/analysis/interpolation/qgstininterpolator.h
@@ -37,7 +37,7 @@ class ANALYSIS_EXPORT QgsTinInterpolator : public QgsInterpolator
 {
   public:
     //! Indicates the type of interpolation to be performed
-    enum class TinInterpolation : int
+    enum class TinInterpolation SIP_MONKEYPATCH_SCOPEENUM_UNNEST( QgsTinInterpolator, TinInterpolation ) : int
     {
       Linear,       //!< Linear interpolation
       CloughTocher, //!< Clough-Tocher interpolation
diff --git a/src/analysis/interpolation/qgstriangulation.h b/src/analysis/interpolation/qgstriangulation.h
@@ -42,7 +42,7 @@ class ANALYSIS_EXPORT QgsTriangulation
 {
   public:
     //! Enumeration describing the behavior, if two forced lines cross.
-    enum class ForcedCrossBehavior : int
+    enum class ForcedCrossBehavior SIP_MONKEYPATCH_SCOPEENUM_UNNEST( QgsTriangulation, ForcedCrossBehavior ) : int
     {
       SnappingTypeVertex, //!< The second inserted forced line is snapped to the closest vertice of the first inserted forced line.
       DeleteFirst,        //!< The status of the first inserted forced line is reset to that of a normal edge (so that the second inserted forced line remain and the first not)
diff --git a/src/analysis/raster/qgskde.h b/src/analysis/raster/qgskde.h
@@ -56,7 +56,7 @@ class ANALYSIS_EXPORT QgsKernelDensityEstimation
     };
 
     //! Result of operation
-    enum class Result : int
+    enum class Result SIP_MONKEYPATCH_SCOPEENUM_UNNEST( QgsKernelDensityEstimation, Result ) : int
     {
       Success,           //!< Operation completed successfully
       DriverError,       //!< Could not open the driver for the specified format
diff --git a/src/analysis/raster/qgsrastercalculator.h b/src/analysis/raster/qgsrastercalculator.h
@@ -75,7 +75,7 @@ class ANALYSIS_EXPORT QgsRasterCalculator
 {
   public:
     //! Result of the calculation
-    enum class Result : int
+    enum class Result SIP_MONKEYPATCH_SCOPEENUM_UNNEST( QgsRasterCalculator, Result ) : int
     {
       Success = 0,           //!< Calculation successful
       CreateOutputError = 1, //!< Error creating output data file

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class ANALYSIS_EXPORT QgsTinInterpolator : public QgsInterpolator`
`37`	`37`	`{`
`38`	`38`	`public:`
`39`	`39`	`//! Indicates the type of interpolation to be performed`
`40`		`- enum class TinInterpolation : int`
	`40`	`+ enum class TinInterpolation SIP_MONKEYPATCH_SCOPEENUM_UNNEST( QgsTinInterpolator, TinInterpolation ) : int`
`41`	`41`	`{`
`42`	`42`	`Linear, //!< Linear interpolation`
`43`	`43`	`CloughTocher, //!< Clough-Tocher interpolation`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ class ANALYSIS_EXPORT QgsTriangulation`
`42`	`42`	`{`
`43`	`43`	`public:`
`44`	`44`	`//! Enumeration describing the behavior, if two forced lines cross.`
`45`		`- enum class ForcedCrossBehavior : int`
	`45`	`+ enum class ForcedCrossBehavior SIP_MONKEYPATCH_SCOPEENUM_UNNEST( QgsTriangulation, ForcedCrossBehavior ) : int`
`46`	`46`	`{`
`47`	`47`	`SnappingTypeVertex, //!< The second inserted forced line is snapped to the closest vertice of the first inserted forced line.`
`48`	`48`	`DeleteFirst, //!< The status of the first inserted forced line is reset to that of a normal edge (so that the second inserted forced line remain and the first not)`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ class ANALYSIS_EXPORT QgsKernelDensityEstimation`
`56`	`56`	`};`
`57`	`57`
`58`	`58`	`//! Result of operation`
`59`		`- enum class Result : int`
	`59`	`+ enum class Result SIP_MONKEYPATCH_SCOPEENUM_UNNEST( QgsKernelDensityEstimation, Result ) : int`
`60`	`60`	`{`
`61`	`61`	`Success, //!< Operation completed successfully`
`62`	`62`	`DriverError, //!< Could not open the driver for the specified format`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ class ANALYSIS_EXPORT QgsRasterCalculator`
`75`	`75`	`{`
`76`	`76`	`public:`
`77`	`77`	`//! Result of the calculation`
`78`		`- enum class Result : int`
	`78`	`+ enum class Result SIP_MONKEYPATCH_SCOPEENUM_UNNEST( QgsRasterCalculator, Result ) : int`
`79`	`79`	`{`
`80`	`80`	`Success = 0, //!< Calculation successful`
`81`	`81`	`CreateOutputError = 1, //!< Error creating output data file`