[sipify] fix remove protected members

3nids · 3nids · commit a260146e94af · 2017-04-19T15:18:54.000+02:00
diff --git a/scripts/sipify.pl b/scripts/sipify.pl
@@ -299,7 +299,7 @@ sub processDoxygenLine
     }
 
     # skip non-method member declaration in non-public sections
-    if ( $SIP_RUN != 1 && $ACCESS != PUBLIC && $line =~ m/^\s*(?:mutable\s)?[\w<>]+(::\w+)? \*?\w+( = \w+(\([^()]+\))?)?;/){
+    if ( $SIP_RUN != 1 && $ACCESS != PUBLIC && $line =~ m/^\s*(?:mutable\s)?\w+[\w<> *&:,]* \*?\w+( = \w+(\([^()]+\))?)?;/){
         next;
     }
 
diff --git a/tests/scripts/sipifyheader.h b/tests/scripts/sipifyheader.h
@@ -242,6 +242,8 @@ class CORE_EXPORT QgsSipifyHeader : public QtClass<QVariant>, private Ui::QgsBas
     Whatever::Something *alsoSkipMember = nullptr;
     mutable Whatever alsoSkipThis;
     Some<Other> memberToSkip;
+    QList<QgsMapLayer *> list2skip;
+    QMap<QString, Qt::CheckState> map2skip;
 
   private:
     void privateMethodAreNotShown();

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