Attempt

Author: nyalldawson

python/PyQt6/core/auto_additions/qgis.py

@@ -396,9 +396,11 @@
 Qgis.PythonMacroMode.baseClass = Qgis
 QgsVectorDataProvider.FeatureCountState = Qgis.FeatureCountState
 # monkey patching scoped based enum
+Qgis.FeatureCountState.Uncounted.value = -2
 QgsVectorDataProvider.Uncounted = Qgis.FeatureCountState.Uncounted
 QgsVectorDataProvider.Uncounted.is_monkey_patched = True
 QgsVectorDataProvider.Uncounted.__doc__ = "Feature count not yet computed"
+Qgis.FeatureCountState.UnknownCount.value = -1
 QgsVectorDataProvider.UnknownCount = Qgis.FeatureCountState.UnknownCount
 QgsVectorDataProvider.UnknownCount.is_monkey_patched = True
 QgsVectorDataProvider.UnknownCount.__doc__ = "Provider returned an unknown feature count"
@@ -1465,6 +1467,7 @@
 # --
 Qgis.GnssConstellation.baseClass = Qgis
 # monkey patching scoped based enum
+Qgis.GpsQualityIndicator.Unknown.value = -1
 Qgis.GpsQualityIndicator.Unknown.__doc__ = "Unknown"
 Qgis.GpsQualityIndicator.Invalid.__doc__ = "Invalid"
 Qgis.GpsQualityIndicator.GPS.__doc__ = "Standalone"

python/PyQt6/core/auto_additions/qgslayout.py

@@ -8,4 +8,5 @@
 QgsLayout.ZViewTool = QgsLayout.ZValues.ZViewTool
 QgsLayout.ZSnapIndicator = QgsLayout.ZValues.ZSnapIndicator
 QgsLayout.UndoLayoutDpi = QgsLayout.UndoCommand.UndoLayoutDpi
+QgsLayout.UndoCommand.UndoNone.value = -1
 QgsLayout.UndoNone = QgsLayout.UndoCommand.UndoNone

python/PyQt6/core/auto_additions/qgslayoutitem.py

@@ -8,6 +8,7 @@
 QgsLayoutItem.LowerLeft = QgsLayoutItem.ReferencePoint.LowerLeft
 QgsLayoutItem.LowerMiddle = QgsLayoutItem.ReferencePoint.LowerMiddle
 QgsLayoutItem.LowerRight = QgsLayoutItem.ReferencePoint.LowerRight
+QgsLayoutItem.UndoCommand.UndoNone.value = -1
 QgsLayoutItem.UndoNone = QgsLayoutItem.UndoCommand.UndoNone
 QgsLayoutItem.UndoIncrementalMove = QgsLayoutItem.UndoCommand.UndoIncrementalMove
 QgsLayoutItem.UndoIncrementalResize = QgsLayoutItem.UndoCommand.UndoIncrementalResize

python/PyQt6/core/auto_additions/qgslayoutmultiframe.py

@@ -14,4 +14,5 @@
 QgsLayoutMultiFrame.UndoTableGridStrokeWidth = QgsLayoutMultiFrame.UndoCommand.UndoTableGridStrokeWidth
 QgsLayoutMultiFrame.UndoTableGridColor = QgsLayoutMultiFrame.UndoCommand.UndoTableGridColor
 QgsLayoutMultiFrame.UndoTableBackgroundColor = QgsLayoutMultiFrame.UndoCommand.UndoTableBackgroundColor
+QgsLayoutMultiFrame.UndoCommand.UndoNone.value = -1
 QgsLayoutMultiFrame.UndoNone = QgsLayoutMultiFrame.UndoCommand.UndoNone

python/PyQt6/core/auto_additions/qgsprocessing.py

@@ -1,5 +1,7 @@
 # The following has been generated automatically from src/core/processing/qgsprocessing.h
+QgsProcessing.SourceType.TypeMapLayer.value = -2
 QgsProcessing.TypeMapLayer = QgsProcessing.SourceType.TypeMapLayer
+QgsProcessing.SourceType.TypeVectorAnyGeometry.value = -1
 QgsProcessing.TypeVectorAnyGeometry = QgsProcessing.SourceType.TypeVectorAnyGeometry
 QgsProcessing.TypeVectorPoint = QgsProcessing.SourceType.TypeVectorPoint
 QgsProcessing.TypeVectorLine = QgsProcessing.SourceType.TypeVectorLine

python/PyQt6/core/auto_additions/qgsprocessingparameters.py

@@ -25,6 +25,7 @@ def _force_int(v): return v if isinstance(v, int) else int(v.value)
 QgsProcessingParameterFile.Folder = QgsProcessingParameterFile.Behavior.Folder
 QgsProcessingParameterNumber.Integer = QgsProcessingParameterNumber.Type.Integer
 QgsProcessingParameterNumber.Double = QgsProcessingParameterNumber.Type.Double
+QgsProcessingParameterField.DataType.Any.value = -1
 QgsProcessingParameterField.Any = QgsProcessingParameterField.DataType.Any
 QgsProcessingParameterField.Numeric = QgsProcessingParameterField.DataType.Numeric
 QgsProcessingParameterField.String = QgsProcessingParameterField.DataType.String

python/PyQt6/gui/auto_additions/qgsmaptoolidentify.py

@@ -1,4 +1,5 @@
 # The following has been generated automatically from src/gui/qgsmaptoolidentify.h
+QgsMapToolIdentify.IdentifyMode.DefaultQgsSetting.value = -1
 QgsMapToolIdentify.DefaultQgsSetting = QgsMapToolIdentify.IdentifyMode.DefaultQgsSetting
 QgsMapToolIdentify.ActiveLayer = QgsMapToolIdentify.IdentifyMode.ActiveLayer
 QgsMapToolIdentify.TopDownStopAtFirst = QgsMapToolIdentify.IdentifyMode.TopDownStopAtFirst

scripts/sipify.pl

@@ -1216,15 +1216,19 @@ sub detect_non_method_member{
                 next if ($LINE =~ m/^\s*\w+\s*\|/); # multi line declaration as sum of enums
 
                 do {no warnings 'uninitialized';
-                    my $enum_decl = $LINE =~ s/^(\s*(?<em>\w+))(\s+SIP_PYNAME(?:\(\s*(?<pyname>[^() ]+)\s*\)\s*)?)?(\s+SIP_MONKEY\w+(?:\(\s*(?<compat>[^() ]+)\s*\)\s*)?)?(?:\s*=\s*(?:[\w\s\d|+-]|::|<<)+)?(,?)(:?\s*\/\/!<\s*(?<co>.*)|.*)$/$1$3$7/r;
+                    my $enum_decl = $LINE =~ s/^(\s*(?<em>\w+))(\s+SIP_PYNAME(?:\(\s*(?<pyname>[^() ]+)\s*\)\s*)?)?(\s+SIP_MONKEY\w+(?:\(\s*(?<compat>[^() ]+)\s*\)\s*)?)?(?:\s*=\s*(?<value>(?:[\w\s\d|+-]|::|<<)+))?(,?)(:?\s*\/\/!<\s*(?<co>.*)|.*)$/$1$3$8/r;
                     my $enum_member = $+{em};
                     my $comment = $+{co};
                     my $compat_name = $+{compat} ? $+{compat} : $enum_member;
+                    my $enum_value = $+{value};
                     # replace :: with . (changes c++ style namespace/class directives to Python style)
                     $comment =~ s/::/./g;
                     $comment =~ s/\"/\\"/g;
                     $comment =~ s/\\since .*?([\d\.]+)/\\n.. versionadded:: $1\\n/i;
                     dbg_info("is_scope_based:$is_scope_based enum_mk_base:$enum_mk_base monkeypatch:$monkeypatch");
+                    if ($is_qt6 and defined $enum_value && $enum_value =~ m/^[-+]?\d+$/ && $enum_value +0 < 0) {
+                        push @OUTPUT_PYTHON, "$ACTUAL_CLASS.$enum_qualname.$enum_member.value = $enum_value\n";
+                    }
                     if ($is_scope_based eq "1" and $enum_member ne "") {
                         if ( $monkeypatch eq 1 and $enum_mk_base ne ""){
                           if ( $ACTUAL_CLASS ne "" ) {