[sipify] Force newlines after sip commands

qgis · Apr 7, 2017 · f82997c · f82997c
1 parent 29fd5cc
commit f82997c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
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
     {