From a260146e94afbb5b5049bcc8b58cbf0ed942c8aa Mon Sep 17 00:00:00 2001
From: Denis Rouzaud <denis.rouzaud@gmail.com>
Date: Wed, 19 Apr 2017 15:18:54 +0200
Subject: [PATCH] [sipify] fix remove protected members

---
 scripts/sipify.pl            | 2 +-
 tests/scripts/sipifyheader.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/sipify.pl b/scripts/sipify.pl
index 050bca8a65d..5e1f8959762 100755
--- a/scripts/sipify.pl
+++ b/scripts/sipify.pl
@@ -299,7 +299,7 @@ while(!eof $header){
     }
 
     # 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
index aee6c77e5ac..ac7607b9b14 100644
--- 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();