[sipify] fix remove protected members

qgis · Apr 19, 2017 · a260146 · a260146
1 parent 51aa44d
commit a260146
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
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();