sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-27 00:33:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

[sipify] fix override removal

Browse Source
This commit is contained in:
Denis Rouzaud 2017-04-03 09:38:40 +02:00
parent cca83b7599
commit 169c60950d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/sipify.pl
View File

@ -287,7 +287,7 @@ while(!eof $header){
do {no warnings 'uninitialized'; do {no warnings 'uninitialized';
# remove keywords # remove keywords
$line =~ s/\s*override( SIP_\w+(\(.+\))?)?;/$1;/; $line =~ s/\s*\boverride\b//;
$line =~ s/^(\s*)?(const )?(virtual |static )?inline /$1$2$3/; $line =~ s/^(\s*)?(const )?(virtual |static )?inline /$1$2$3/;
$line =~ s/\bnullptr\b/0/g; $line =~ s/\bnullptr\b/0/g;
$line =~ s/\s*=\s*default\b//g; $line =~ s/\s*=\s*default\b//g;
@ -321,7 +321,7 @@ while(!eof $header){
} }
# remove function bodies # remove function bodies
if ( $line =~ m/^(\s*)?(const )?(virtual |static )?((\w+(<.*?>)?\s+(\*|&)?)?(\w+|operator.)\(.*?(\(.*\))*.*\)( (?:const|SIP_[A-Z_]*?))*)\s*(override)?\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"; my $newline = "$1$2$3$4;\n";
if ($line !~ m/\{.*?\}$/){ if ($line !~ m/\{.*?\}$/){
$line = readline $header; $line = readline $header;