[sipify] fix enum combination

3nids · 3nids · commit 51aa44de5f4a · 2017-04-19T15:03:31.000+02:00
diff --git a/python/core/processing/qgsprocessingalgorithm.sip b/python/core/processing/qgsprocessingalgorithm.sip
@@ -27,7 +27,7 @@ class QgsProcessingAlgorithm
       FlagHideFromToolbox,
       FlagHideFromModeler,
       FlagSupportsBatch,
-      FlagDeprecated
+      FlagDeprecated,
     };
     typedef QFlags<QgsProcessingAlgorithm::Flag> Flags;
 
diff --git a/scripts/sipify.pl b/scripts/sipify.pl
@@ -289,7 +289,7 @@ sub processDoxygenLine
             if ($line =~ m/\};/){
                 last;
             }
-            $line =~ s/(\s*\w+)(\s*=\s*[\w\s\d<]+.*?)?(,?).*$/$1$3/;
+            $line =~ s/(\s*\w+)(\s*=\s*[\w\s\d<|]+.*?)?(,?).*$/$1$3/;
             print $line;
         }
         print $line;
diff --git a/tests/scripts/sipifyheader.expected.sip b/tests/scripts/sipifyheader.expected.sip
@@ -64,6 +64,7 @@ class QgsSipifyHeader : QtClass<QVariant>
       NoSuccess,
       ImaginarySuccess,
       RecursiveSuccess,
+      SuccessCombination,
     };
     typedef QFlags<QgsSipifyHeader::MyEnum> Flags;
 
diff --git a/tests/scripts/sipifyheader.h b/tests/scripts/sipifyheader.h
@@ -102,6 +102,7 @@ class CORE_EXPORT QgsSipifyHeader : public QtClass<QVariant>, private Ui::QgsBas
       NoSuccess = 1, //!< Edit operation resulted in an empty geometry
       ImaginarySuccess = 1 << 3, //!< Edit operation resulted in an imaginary geometry
       RecursiveSuccess = 1 << 4, //!< Edit operation resulted in an n-dimensional wormhole
+      SuccessCombination = Success | ImaginarySuccess, //!< Holy Graal
     };
     Q_DECLARE_FLAGS( Flags, MyEnum )
 

Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ sub processDoxygenLine`
`289`	`289`	`if ($line =~ m/\};/){`
`290`	`290`	`last;`
`291`	`291`	`}`
`292`		`- $line =~ s/(\s\w+)(\s=\s[\w\s\d<]+.?)?(,?).*$/$1$3/;`
	`292`	`+ $line =~ s/(\s\w+)(\s=\s[\w\s\d<\|]+.?)?(,?).*$/$1$3/;`
`293`	`293`	`print $line;`
`294`	`294`	`}`
`295`	`295`	`print $line;`