Fix sipify override and inline definition combination

qgis · Apr 2, 2017 · 16594da · 3nids · Apr 3, 2017 · m-kuhn
1 parent a609883
commit 16594da
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
@@ -305,7 +305,7 @@ sub processDoxygenLine
         }
 
         # remove function bodies
-        if ( $line =~  m/^(\s*)?(const )?(virtual |static )?((\w+(<.*?>)?\s+(\*|&)?)?(\w+|operator.)\(.*?(\(.*\))*.*\)( (?:const|SIP_[A-Z_]*?))*)\s*(\{.*\})?(?!;)(\s*\/\/.*)?$/ ){
+        if ( $line =~  m/^(\s*)?(const )?(virtual |static )?((\w+(<.*?>)?\s+(\*|&)?)?(\w+|operator.)\(.*?(\(.*\))*.*\)( (?:const|SIP_[A-Z_]*?))*)\s*(override)?\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
@@ -150,6 +150,7 @@ complex default value and type (i.e. containing commas) should be given as a str
 
     bool removeFunctionBody( const QList<int, QString> &list, QgsVectorLayer *vl );
 
+    virtual int overriddenProperty();
   protected:
     bool thisShouldBeListed();
 

diff --git a/tests/scripts/sipifyheader.h b/tests/scripts/sipifyheader.h
@@ -182,6 +182,8 @@ class CORE_EXPORT QgsSipifyHeader : public QtClass<QVariant>, private QgsBaseCla
 
     bool deletedFunction() = delete; // some comments
 
+    virtual int overriddenProperty() override { return 42; } // if in doubt, comment it out
+
   protected:
     bool thisShouldBeListed();