[sipify] Fix stripping function body with virtual const reference ret…

…urns
qgis · Apr 11, 2017 · 669fa87 · 669fa87
1 parent 5fb63c0
commit 669fa87
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/scripts/sipify.pl b/scripts/sipify.pl
@@ -347,7 +347,7 @@ sub processDoxygenLine
         }
 
         # remove function bodies
-        if ( $line =~  m/^(\s*)?(const )?(virtual |static )?(([\w:]+(<.*?>)?\s+(\*|&)?)?(\w+|operator.{1,2})\(.*?(\(.*\))*.*\)( (?:const|SIP_[A-Z_]*?))*)\s*(\{.*\})?(?!;)(\s*\/\/.*)?$/ ){
+        if ( $line =~  m/^(\s*)?(virtual )?(static |const )*(([\w:]+(<.*?>)?\s+(\*|&)?)?(\w+|operator.{1,2})\(.*?(\(.*\))*.*\)( (?: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
@@ -190,6 +190,12 @@ Removing function body with namespaced return value
  :rtype: QgsRaster.RasterBuildPyramids
 %End
 
+    virtual const QgsLayerMetadata &metadata() const;
+%Docstring
+Removing function body with virtual const reference
+ :rtype: QgsLayerMetadata
+%End
+
 
     virtual int overriddenProperty();
 %Docstring

diff --git a/tests/scripts/sipifyheader.h b/tests/scripts/sipifyheader.h
@@ -205,6 +205,9 @@ class CORE_EXPORT QgsSipifyHeader : public QtClass<QVariant>, private Ui::QgsBas
     //! Removing function body with namespaced return value
     QgsRaster::RasterBuildPyramids buildPyramidsFlag() const { return mBuildPyramidsFlag; }
 
+    //! Removing function body with virtual const reference
+    virtual const QgsLayerMetadata &metadata() const { return mMetadata; }
+
     bool deletedFunction() = delete; // some comments
 
     virtual int overriddenProperty() override { return 42; } // if in doubt, comment it out