[sipify] fix again template inheritance

qgis · Jun 13, 2017 · 5a5dc31 · 5a5dc31
1 parent a3b64e2
commit 5a5dc31
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/scripts/sipify.pl b/scripts/sipify.pl
@@ -524,8 +524,8 @@ sub detect_comment_block{
                 push @template_inheritance_template, $1;
                 push @template_inheritance_class, $2;
             }
-            $m =~ s/(\b(?!QList)\w+)<((?:[\w ]|::)+)>/$1${2}Base/g; # use the typeded as template inheritance
-            $m =~ s/(\w+)<((?:[\w ]|::)+)>//g; # remove remaining templates
+            $m =~ s/(\b(?!QList)\w+)< *((?:\w|::)+) *>/$1${2}Base/g; # use the typeded as template inheritance
+            $m =~ s/(\w+)< *((?:w|::)+) *>//g; # remove remaining templates
             $m =~ s/([:,])\s*,/$1/g;
             $m =~ s/(\s*[:,])?\s*$//;
             $LINE .= $m;