[sipify] Also skip mutable protected members

nyalldawson · nyalldawson · commit 18c1e6233b93 · 2017-04-10T17:00:12.000+10:00
diff --git a/scripts/sipify.pl b/scripts/sipify.pl
@@ -296,7 +296,7 @@ sub processDoxygenLine
     }
 
     # skip non-method member declaration in non-public sections
-    if ( $SIP_RUN != 1 && $ACCESS != PUBLIC && $line =~ m/^\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
@@ -228,6 +228,7 @@ class CORE_EXPORT QgsSipifyHeader : public QtClass<QVariant>, private Ui::QgsBas
 
     Whatever skipMember;
     Whatever::Something *alsoSkipMember = nullptr;
+    mutable Whatever alsoSkipThis;
     Some<Other> memberToSkip;
 
   private:

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