[sipify] prevent creation of param list when not necessary

qgis · Jan 13, 2018 · 4568bcd · 4568bcd
1 parent 6d94ac9
commit 4568bcd
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/python/core/qgsmaplayer.sip b/python/core/qgsmaplayer.sip
@@ -1221,7 +1221,6 @@ Set whether provider notification is connected to triggerRepaint
 %Docstring
 Set the notification message that triggers repaine
 If refresh on notification is enabled, the notification will triggerRepaint only
-
 if the notification message is equal to:param message:
 
 .. versionadded:: 3.0

diff --git a/python/core/qgsvectorlayercache.sip b/python/core/qgsvectorlayercache.sip
@@ -154,7 +154,6 @@ Query the layer for the features which intersect the specified rectangle.
     bool isFidCached( const QgsFeatureId fid ) const;
 %Docstring
 Check if a certain feature id is cached.
-
 \param  fid The feature id to look for
 
 :return: True if this id is in the cache

diff --git a/python/gui/attributetable/qgsfeaturelistmodel.sip b/python/gui/attributetable/qgsfeaturelistmodel.sip
@@ -72,7 +72,6 @@ Constructor for QgsFeatureListModel
 
     bool setDisplayExpression( const QString &expression );
 %Docstring
-
 \param  expression   A QgsExpression compatible string.
 
 :return: true if the expression could be set, false if there was a parse error.

diff --git a/scripts/sipify.pl b/scripts/sipify.pl
@@ -166,12 +166,14 @@ sub processDoxygenLine {
     # params
     if ( $line =~ m/\\param / ){
         $line =~ s/\s*\\param (\w+)\b/:param $1:/g;
-        if ( $COMMENT_PARAM_LIST == 0 )
-        {
-            $line = "\n$line";
+        if ( $line =~ m/^:param/ ){
+          if ( $COMMENT_PARAM_LIST == 0 )
+          {
+              $line = "\n$line";
+          }
+          $COMMENT_PARAM_LIST = 1;
+          $COMMENT_LAST_LINE_NOTE_WARNING = 0;
         }
-        $COMMENT_PARAM_LIST = 1;
-        $COMMENT_LAST_LINE_NOTE_WARNING = 0;
     }
 
     if ( $line =~ m/^\s*[\\@]brief/){