followup 8f35ee4

3nids · 3nids · commit fbe10d461c55 · 2017-04-24T14:54:07.000+02:00
diff --git a/scripts/sipify.pl b/scripts/sipify.pl
@@ -320,7 +320,7 @@ sub processDoxygenLine
         if ($line =~ m/\{((\s*\w+)(\s*=\s*[\w\s\d<|]+.*?)?(,?))+\s*\}/){
           # one line declaration
           $line !~ m/=/ or die 'spify.pl does not handle enum one liners with value assignment. Use multiple lines instead.';
-          push @output, "$line\n";
+          next;
         }
         else
         {
diff --git a/tests/scripts/sipifyheader.expected.sip b/tests/scripts/sipifyheader.expected.sip
@@ -71,8 +71,6 @@ class QgsSipifyHeader : QtClass<QVariant>
 
 
     enum OneLiner { Success, NoSuccess };
-    enum OneLiner { Success, NoSuccess };
-    enum OneLiner;
 
     struct Data
     {

Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,7 @@ sub processDoxygenLine`
`320`	`320`	`if ($line =~ m/\{((\s\w+)(\s=\s[\w\s\d<\|]+.?)?(,?))+\s*\}/){`
`321`	`321`	`# one line declaration`
`322`	`322`	`$line !~ m/=/ or die 'spify.pl does not handle enum one liners with value assignment. Use multiple lines instead.';`
`323`		`- push @output, "$line\n";`
	`323`	`+ next;`
`324`	`324`	`}`
`325`	`325`	`else`
`326`	`326`	`{`
Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,6 @@ class QgsSipifyHeader : QtClass<QVariant>`
`71`	`71`
`72`	`72`
`73`	`73`	`enum OneLiner { Success, NoSuccess };`
`74`		`- enum OneLiner { Success, NoSuccess };`
`75`		`- enum OneLiner;`
`76`	`74`
`77`	`75`	`struct Data`
`78`	`76`	`{`