Promote some processing enums to enum class, cleanups

Author: nyalldawson

python/PyQt6/core/auto_additions/qgsprocessing.py

@@ -12,9 +12,18 @@
 QgsProcessing.TypePointCloud = QgsProcessing.SourceType.TypePointCloud
 QgsProcessing.TypeAnnotation = QgsProcessing.SourceType.TypeAnnotation
 QgsProcessing.TypeVectorTile = QgsProcessing.SourceType.TypeVectorTile
+# monkey patching scoped based enum
 QgsProcessing.PythonQgsProcessingAlgorithmSubclass = QgsProcessing.PythonOutputType.PythonQgsProcessingAlgorithmSubclass
+QgsProcessing.PythonQgsProcessingAlgorithmSubclass.is_monkey_patched = True
+QgsProcessing.PythonOutputType.PythonQgsProcessingAlgorithmSubclass.__doc__ = "Full Python QgsProcessingAlgorithm subclass"
+QgsProcessing.PythonOutputType.__doc__ = "Available Python output types\n\n" + '* ``PythonQgsProcessingAlgorithmSubclass``: ' + QgsProcessing.PythonOutputType.PythonQgsProcessingAlgorithmSubclass.__doc__
+# --
+QgsProcessing.PythonOutputType.baseClass = QgsProcessing
 # monkey patching scoped based enum
 QgsProcessing.LayerOptionsFlag.SkipIndexGeneration.__doc__ = "Do not generate index when creating a layer. Makes sense only for point cloud layers"
 QgsProcessing.LayerOptionsFlag.__doc__ = "Layer options flags\n\n.. versionadded:: 3.32\n\n" + '* ``SkipIndexGeneration``: ' + QgsProcessing.LayerOptionsFlag.SkipIndexGeneration.__doc__
 # --
+QgsProcessing.LayerOptionsFlag.baseClass = QgsProcessing
 QgsProcessing.LayerOptionsFlags = lambda flags=0: QgsProcessing.LayerOptionsFlag(flags)
+QgsProcessing.LayerOptionsFlags.baseClass = QgsProcessing
+LayerOptionsFlags = QgsProcessing  # dirty hack since SIP seems to introduce the flags in module

python/PyQt6/core/auto_additions/qgsprocessingutils.py

@@ -26,5 +26,6 @@
 QgsProcessingUtils.LayerHint.TiledScene.__doc__ = "Tiled scene layer type, since QGIS 3.34"
 QgsProcessingUtils.LayerHint.__doc__ = "Layer type hints.\n\n.. versionadded:: 3.4\n\n" + '* ``UnknownType``: ' + QgsProcessingUtils.LayerHint.UnknownType.__doc__ + '\n' + '* ``Vector``: ' + QgsProcessingUtils.LayerHint.Vector.__doc__ + '\n' + '* ``Raster``: ' + QgsProcessingUtils.LayerHint.Raster.__doc__ + '\n' + '* ``Mesh``: ' + QgsProcessingUtils.LayerHint.Mesh.__doc__ + '\n' + '* ``PointCloud``: ' + QgsProcessingUtils.LayerHint.PointCloud.__doc__ + '\n' + '* ``Annotation``: ' + QgsProcessingUtils.LayerHint.Annotation.__doc__ + '\n' + '* ``VectorTile``: ' + QgsProcessingUtils.LayerHint.VectorTile.__doc__ + '\n' + '* ``TiledScene``: ' + QgsProcessingUtils.LayerHint.TiledScene.__doc__
 # --
+QgsProcessingUtils.LayerHint.baseClass = QgsProcessingUtils
 QgsProcessingFeatureSource.FlagSkipGeometryValidityChecks = QgsProcessingFeatureSource.Flag.FlagSkipGeometryValidityChecks
 QgsProcessingFeatureSource.Flags = lambda flags=0: QgsProcessingFeatureSource.Flag(flags)

python/PyQt6/core/auto_generated/processing/qgsprocessing.sip.in

@@ -24,6 +24,9 @@ and parameters.
 %TypeHeaderCode
 #include "qgsprocessing.h"
 %End
+  public:
+    static const QMetaObject staticMetaObject;
+
   public:
 
     enum SourceType
@@ -43,7 +46,7 @@ and parameters.
       TypeVectorTile
     };
 
-    enum PythonOutputType
+    enum class PythonOutputType
     {
       PythonQgsProcessingAlgorithmSubclass,
     };

python/PyQt6/core/auto_generated/processing/qgsprocessingparameteraggregate.sip.in

@@ -36,7 +36,7 @@ Constructor for QgsProcessingParameterAggregate.
 
     virtual QString valueAsPythonString( const QVariant &value, QgsProcessingContext &context ) const;
 
-    virtual QString asPythonString( QgsProcessing::PythonOutputType outputType = QgsProcessing::PythonQgsProcessingAlgorithmSubclass ) const;
+    virtual QString asPythonString( QgsProcessing::PythonOutputType outputType = QgsProcessing::PythonOutputType::PythonQgsProcessingAlgorithmSubclass ) const;
 
     virtual QMap<QString, QVariant> toVariantMap() const;
 

python/PyQt6/core/auto_generated/processing/qgsprocessingparameteralignrasterlayers.sip.in

@@ -51,7 +51,7 @@ Constructor for QgsProcessingParameterAlignRasterLayers.
 
     virtual QString valueAsPythonString( const QVariant &value, QgsProcessingContext &context ) const;
 
-    virtual QString asPythonString( QgsProcessing::PythonOutputType outputType = QgsProcessing::PythonQgsProcessingAlgorithmSubclass ) const;
+    virtual QString asPythonString( QgsProcessing::PythonOutputType outputType = QgsProcessing::PythonOutputType::PythonQgsProcessingAlgorithmSubclass ) const;
 
     virtual QString valueAsString( const QVariant &value, QgsProcessingContext &context, bool &ok /Out/ ) const;
 

python/PyQt6/core/auto_generated/processing/qgsprocessingparameterdxflayers.sip.in

@@ -49,7 +49,7 @@ Constructor for QgsProcessingParameterDxfLayers.
 
     virtual QString valueAsPythonString( const QVariant &value, QgsProcessingContext &context ) const;
 
-    virtual QString asPythonString( QgsProcessing::PythonOutputType outputType = QgsProcessing::PythonQgsProcessingAlgorithmSubclass ) const;
+    virtual QString asPythonString( QgsProcessing::PythonOutputType outputType = QgsProcessing::PythonOutputType::PythonQgsProcessingAlgorithmSubclass ) const;
 
     virtual QString valueAsString( const QVariant &value, QgsProcessingContext &context, bool &ok /Out/ ) const;
 

python/PyQt6/core/auto_generated/processing/qgsprocessingparameterfieldmap.sip.in

@@ -36,7 +36,7 @@ Constructor for QgsProcessingParameterFieldMapping.
 
     virtual QString valueAsPythonString( const QVariant &value, QgsProcessingContext &context ) const;
 
-    virtual QString asPythonString( QgsProcessing::PythonOutputType outputType = QgsProcessing::PythonQgsProcessingAlgorithmSubclass ) const;
+    virtual QString asPythonString( QgsProcessing::PythonOutputType outputType = QgsProcessing::PythonOutputType::PythonQgsProcessingAlgorithmSubclass ) const;
 
     virtual QMap<QString, QVariant> toVariantMap() const;
 

python/PyQt6/core/auto_generated/processing/qgsprocessingparametermeshdataset.sip.in

@@ -51,7 +51,7 @@ Constructor
 
     virtual QString valueAsPythonString( const QVariant &value, QgsProcessingContext &context ) const;
 
-    virtual QString asPythonString( QgsProcessing::PythonOutputType outputType = QgsProcessing::PythonQgsProcessingAlgorithmSubclass ) const;
+    virtual QString asPythonString( QgsProcessing::PythonOutputType outputType = QgsProcessing::PythonOutputType::PythonQgsProcessingAlgorithmSubclass ) const;
 
     virtual QStringList dependsOnOtherParameters() const;
 
@@ -128,7 +128,7 @@ Constructor
 
     virtual QString valueAsPythonString( const QVariant &value, QgsProcessingContext &context ) const;
 
-    virtual QString asPythonString( QgsProcessing::PythonOutputType outputType = QgsProcessing::PythonQgsProcessingAlgorithmSubclass ) const;
+    virtual QString asPythonString( QgsProcessing::PythonOutputType outputType = QgsProcessing::PythonOutputType::PythonQgsProcessingAlgorithmSubclass ) const;
 
     virtual QStringList dependsOnOtherParameters() const;