also "s/( )/()/;" in sipify.pl (followup 4f9a9e0)

jef-n · jef-n · commit c29fc35155b3 · 2017-07-19T10:36:12.000+02:00
diff --git a/scripts/sipify.pl b/scripts/sipify.pl
@@ -253,6 +253,7 @@ sub fix_annotations {
         }
         # see https://regex101.com/r/5iNptO/4
         $line =~ s/(?<coma>, +)?(const )?(\w+)(\<(?>[^<>]|(?4))*\>)?\s+[\w&*]+\s+SIP_PYARGREMOVE( = [^()]*(\(\s*(?:[^()]++|(?6))*\s*\))?)?(?(<coma>)|,?)//g;
+        $line =~ s/\(\s+\)/()/;
     }
     $line =~ s/SIP_FORCE//;
     return $line;
diff --git a/tests/code_layout/sipifyheader.expected.sip b/tests/code_layout/sipifyheader.expected.sip
@@ -304,15 +304,15 @@ Mulitline body
     void combinedAnnotations() /Factory,PyName=otherName/;
     void multiAnnotationArg( SomeClass **object /Out,TransferBack/, int &another /Out/ );
 
-    void simple(  );
+    void simple();
 %Docstring
 remove argument
 %End
     void method( );
     void test( );
     void avoidIntersections( const QList<QgsVectorLayer *> &avoidIntersectionsLayers );
 
-    void position(  );
+    void position();
     void position(  bool keep );
     void position( bool keep, bool keep );
     void position( bool keep );
diff --git a/tests/code_layout/sipifyheader.h b/tests/code_layout/sipifyheader.h
@@ -333,7 +333,7 @@ class CORE_EXPORT QgsSipifyHeader : public QtClass<QVariant>, private Ui::QgsBas
 
     //! remove argument
     void simple( bool test SIP_PYARGREMOVE );
-    void method( bool myArg SIP_PYARGREMOVE =  test );
+    void method( bool myArg SIP_PYARGREMOVE = test );
     void test( QgsMapLayer *vl SIP_PYARGREMOVE = nullptr );
     void avoidIntersections( const QList<QgsVectorLayer *> &avoidIntersectionsLayers,
                              const QHash<QgsVectorLayer *, QSet<QgsFeatureId> > &ignoreFeatures SIP_PYARGREMOVE = ( QHash<QgsVectorLayer *, QSet<QgsFeatureId> >() ) );

Original file line number	Diff line number	Diff line change
`@@ -253,6 +253,7 @@ sub fix_annotations {`
`253`	`253`	`}`
`254`	`254`	`# see https://regex101.com/r/5iNptO/4`
`255`	`255`	`$line =~ s/(?<coma>, +)?(const )?(\w+)(\<(?>[^<>]\|(?4))\>)?\s+[\w&]+\s+SIP_PYARGREMOVE( = [^()](\(\s(?:[^()]++\|(?6))\s\))?)?(?(<coma>)\|,?)//g;`
	`256`	`+ $line =~ s/\(\s+\)/()/;`
`256`	`257`	`}`
`257`	`258`	`$line =~ s/SIP_FORCE//;`
`258`	`259`	`return $line;`