[sipify] Force newlines after sip commands

m-kuhn · m-kuhn · commit f82997c4aa75 · 2017-04-07T12:26:30.000+02:00
diff --git a/python/core/qgsclipper.sip b/python/core/qgsclipper.sip
@@ -13,6 +13,7 @@
 
 %Feature ARM // Some parts are not available in sip bindings on ARM because of qreal double vs. float issues
 
+
 class QgsClipper
 {
 %Docstring
@@ -47,6 +48,7 @@ class QgsClipper
     };
 
 %If (!ARM) // Not available on ARM sip bindings because of qreal issues
+
     static void trimFeature( QVector<double> &x,
                              QVector<double> &y,
                              bool shapeOpen );
@@ -62,6 +64,7 @@ class QgsClipper
 %End
 
 %End
+
     static void trimPolygon( QPolygonF &pts, const QgsRectangle &clipRect );
 
     static QPolygonF clippedLine( const QgsCurve &curve, const QgsRectangle &clipExtent );
diff --git a/python/core/qgspropertytransformer.sip b/python/core/qgspropertytransformer.sip
@@ -136,6 +136,7 @@ class QgsPropertyTransformer
     else
       sipType = sipType_QgsPropertyTransformer;
 %End
+
   public:
 
     enum Type
diff --git a/scripts/sipify.pl b/scripts/sipify.pl
@@ -64,11 +64,11 @@ sub processDoxygenLine
     #print $line;
 
     if ($line =~ m/^\s*SIP_FEATURE\( (\w+) \)(.*)$/){
-        print "%Feature $1$2";
+        print "%Feature $1$2\n";
         next;
     }
     if ($line =~ m/^\s*SIP_IF_FEATURE\( (\!?\w+) \)(.*)$/){
-        print "%If ($1)$2";
+        print "%If ($1)$2\n";
         next;
     }
     if ($line =~ m/^\s*SIP_CONVERT_TO_SUBCLASS_CODE(.*)$/){
@@ -77,7 +77,7 @@ sub processDoxygenLine
     }
 
     if ($line =~ m/^\s*SIP_END(.*)$/){
-        print "%End$1";
+        print "%End$1\n";
         next;
     }
 
diff --git a/tests/scripts/sipifyheader.expected.sip b/tests/scripts/sipifyheader.expected.sip
@@ -58,6 +58,7 @@ class QgsSipifyHeader : QtClass<QVariant>
     else
       sipType = sipType_QgsStandardSipifyHeader;
 %End
+
   public:
     enum MyEnum
     {

Original file line number	Diff line number	Diff line change
`@@ -64,11 +64,11 @@ sub processDoxygenLine`
`64`	`64`	`#print $line;`
`65`	`65`
`66`	`66`	`if ($line =~ m/^\sSIP_FEATURE\( (\w+) \)(.)$/){`
`67`		`- print "%Feature $1$2";`
	`67`	`+ print "%Feature $1$2\n";`
`68`	`68`	`next;`
`69`	`69`	`}`
`70`	`70`	`if ($line =~ m/^\sSIP_IF_FEATURE\( (\!?\w+) \)(.)$/){`
`71`		`- print "%If ($1)$2";`
	`71`	`+ print "%If ($1)$2\n";`
`72`	`72`	`next;`
`73`	`73`	`}`
`74`	`74`	`if ($line =~ m/^\sSIP_CONVERT_TO_SUBCLASS_CODE(.)$/){`
`@@ -77,7 +77,7 @@ sub processDoxygenLine`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`if ($line =~ m/^\sSIP_END(.)$/){`
`80`		`- print "%End$1";`
	`80`	`+ print "%End$1\n";`
`81`	`81`	`next;`
`82`	`82`	`}`
`83`	`83`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ class QgsSipifyHeader : QtClass<QVariant>`
`58`	`58`	`else`
`59`	`59`	`sipType = sipType_QgsStandardSipifyHeader;`
`60`	`60`	`%End`
	`61`	`+`
`61`	`62`	`public:`
`62`	`63`	`enum MyEnum`
`63`	`64`	`{`