Fix sipify annotations and inline definition combination

qgis · Apr 2, 2017 · f1162f7 · f1162f7
1 parent d3daf60
commit f1162f7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/scripts/sipify.pl b/scripts/sipify.pl
@@ -291,7 +291,7 @@ sub processDoxygenLine
         }
 
         # remove function bodies
-        if ( $line =~  m/^(\s*)?(const )?(virtual |static )?((\w+(<.*?>)?\s+(\*|&)?)?(\w+|operator.)\(.*?(\(.*\))*.*\)( const)?)\s*(\{.*\})?(?!;)(\s*\/\/.*)?$/ ){
+        if ( $line =~  m/^(\s*)?(const )?(virtual |static )?((\w+(<.*?>)?\s+(\*|&)?)?(\w+|operator.)\(.*?(\(.*\))*.*\)( (?:const|SIP_[A-Z_]*?))*)\s*(\{.*\})?(?!;)(\s*\/\/.*)?$/ ){
             my $newline = "$1$2$3$4;\n";
             if ($line !~ m/\{.*?\}$/){
                 $line = readline $header;

diff --git a/tests/scripts/sipifyheader.expected.sip b/tests/scripts/sipifyheader.expected.sip
@@ -85,6 +85,8 @@ A multiline method signature
 Factory annotation
 %End
 
+    SomeObject *createAnother() /Factory/;
+
     void LongDocStringMethod();
 %Docstring
  My long doc string

diff --git a/tests/scripts/sipifyheader.h b/tests/scripts/sipifyheader.h
@@ -116,6 +116,8 @@ class CORE_EXPORT QgsSipifyHeader : public QtClass<QVariant>, private QgsBaseCla
     //! Factory annotation
     virtual QgsMapLayerRenderer *createMapRenderer( QgsRenderContext &rendererContext ) override SIP_FACTORY;
 
+    SomeObject *createAnother() SIP_FACTORY { return something; }
+
     /**
      * My long doc string
      * is not very interesting!