[sipify] skip non-public template based member declarations

m-kuhn · m-kuhn · commit 14e949b96cb5 · 2017-04-08T23:42:55.000+02:00
diff --git a/python/core/qgscolorramp.sip b/python/core/qgscolorramp.sip
@@ -440,7 +440,6 @@ class QgsLimitedRandomColorRamp : QgsColorRamp
 %End
 
   protected:
-    QList<QColor> mColors;
 };
 
 class QgsRandomColorRamp: QgsColorRamp
@@ -498,7 +497,6 @@ class QgsRandomColorRamp: QgsColorRamp
 
   protected:
 
-    QList<QColor> mPrecalculatedColors;
 
 };
 
@@ -710,7 +708,6 @@ class QgsColorBrewerColorRamp : QgsColorRamp
 Generates the scheme using the current name and number of colors
 %End
 
-    QList<QColor> mPalette;
 };
 
 
diff --git a/scripts/sipify.pl b/scripts/sipify.pl
@@ -295,8 +295,8 @@ sub processDoxygenLine
         next;
     }
 
-    # skip non-method member declaration (in non-public sections)
-    if ( $SIP_RUN != 1 && $ACCESS != PUBLIC && $line =~ m/^\s*\w+(::\w+)? \*?\w+( = \w+(\([^()]+\))?)?;/){
+    # skip non-method member declaration in non-public sections
+    if ( $SIP_RUN != 1 && $ACCESS != PUBLIC && $line =~ m/^\s*[\w<>]+(::\w+)? \*?\w+( = \w+(\([^()]+\))?)?;/){
         next;
     }
 
diff --git a/tests/scripts/sipifyheader.expected.sip b/tests/scripts/sipifyheader.expected.sip
@@ -225,6 +225,8 @@ Removing function body with namespaced return value
  :rtype: set of QgsActionScope
 %End
 
+    This<Member> shouldBeIncluded;
+
   protected:
     bool thisShouldBeListed();
 %Docstring
diff --git a/tests/scripts/sipifyheader.h b/tests/scripts/sipifyheader.h
@@ -221,11 +221,14 @@ class CORE_EXPORT QgsSipifyHeader : public QtClass<QVariant>, private Ui::QgsBas
 
     QSet<QgsActionScope> returnTypeSet();
 
+    This<Member> shouldBeIncluded;
+
   protected:
     bool thisShouldBeListed();
 
     Whatever skipMember;
     Whatever::Something *alsoSkipMember = nullptr;
+    Some<Other> memberToSkip;
 
   private:
     void privateMethodAreNotShown();

Original file line number	Diff line number	Diff line change
`@@ -295,8 +295,8 @@ sub processDoxygenLine`
`295`	`295`	`next;`
`296`	`296`	`}`
`297`	`297`
`298`		`- # skip non-method member declaration (in non-public sections)`
`299`		`- if ( $SIP_RUN != 1 && $ACCESS != PUBLIC && $line =~ m/^\s\w+(::\w+)? \?\w+( = \w+(\([^()]+\))?)?;/){`
	`298`	`+ # skip non-method member declaration in non-public sections`
	`299`	`+ if ( $SIP_RUN != 1 && $ACCESS != PUBLIC && $line =~ m/^\s[\w<>]+(::\w+)? \?\w+( = \w+(\([^()]+\))?)?;/){`
`300`	`300`	`next;`
`301`	`301`	`}`
`302`	`302`