[sipify] fix initializer in strcuts

qgis · Nov 28, 2018 · 7bce934 · 7bce934
1 parent 5f6dff0
commit 7bce934
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/scripts/sipify.pl b/scripts/sipify.pl
@@ -1006,7 +1006,8 @@ sub detect_non_method_member{
     };
 
     # remove struct member assignment
-    if ( $SIP_RUN != 1 && $ACCESS[$#ACCESS] == PUBLIC && $LINE =~ m/^(\s*\w+[\w<> *&:,]* \*?\w+) = [\-\w\:\.]+(\([^()]*\))?\s*;/ ){
+    # https://regex101.com/r/tWRGkY/2
+    if ( $SIP_RUN != 1 && $ACCESS[$#ACCESS] == PUBLIC && $LINE =~ m/^(\s*\w+[\w<> *&:,]* \*?\w+) = [\-\w\:\.]+(<\w+( \*)?>)?(\([^()]*\))?\s*;/ ){
         dbg_info("remove struct member assignment");
         $LINE = "$1;";
     }

diff --git a/tests/code_layout/sipifyheader.expected.sip b/tests/code_layout/sipifyheader.expected.sip
@@ -93,6 +93,7 @@ typedef QtClass<QVariant> QtClassQVariantBase;
       QString mName;
       int mCount;
       QgsMapLayer *mLayer;
+      QList<QAction *> contextMenuActions;
     };
 
     static const int MONTHS;

diff --git a/tests/code_layout/sipifyheader.h b/tests/code_layout/sipifyheader.h
@@ -134,6 +134,7 @@ class CORE_EXPORT QgsSipifyHeader : public QtClass<QVariant>, private Ui::QgsBas
       QString mName;
       int mCount = 100;
       QgsMapLayer *mLayer = nullptr;
+      QList<QAction *> contextMenuActions = QList<QAction *>();
     };
 
     static const int MONTHS = 60 * 60 * 24 * 30; // something