sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-13 00:03:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

[sipify] handle override method signature on several lines

Browse Source
This commit is contained in:
Denis Rouzaud 2017-04-20 13:58:56 +02:00
parent 8f2a5c7c00
commit 1ab5a628df
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/sipify.pl
View File

@ -338,11 +338,26 @@ while ($line_idx < $line_count){
# remove keywords
if ( $line =~ m/\boverride\b/){
$is_override = 1;
if ( $line !~ m/^(\s*)virtual\b(.*)$/ ){
# handle multiline definition to add virtual keyword on opening line
if ( $MULTILINE_DEFINITION == 1 ){
my $virtual_line = $line;
my $virtual_line_idx = $line_idx;
while ( $virtual_line !~ m/^[^()]*\(([^()]*\([^()]*\)[^()]*)*[^()]*$/){
$virtual_line_idx--;
$virtual_line = $lines[$virtual_line_idx];
$virtual_line_idx >= 0 or die 'could not reach opening definition';
}
if ( $virtual_line !~ m/^(\s*)virtual\b(.*)$/ ){
my $idx = $#output-$line_idx+$virtual_line_idx+2;
#print "len: $#output line_idx: $line_idx virt: $virtual_line_idx\n"idx: $idx\n$output[$idx]\n";
$output[$idx] = $virtual_line =~ s/^(\s*?)\b(.*)$/$1 virtual $2\n/r;
}
}
elsif ( $line !~ m/^(\s*)virtual\b(.*)$/ ){
#sip often requires the virtual keyword to be present, or it chokes on covariant return types
#in overridden methods
$line =~ m/^(\s*?)\b(.*)$/;
$line = "$1virtual $2\n";
$line =~ s/^(\s*?)\b(.*)$/$1virtual $2\n/;
}
}
$line =~ s/\s*\boverride\b//;
@ -467,6 +482,7 @@ while ($line_idx < $line_count){
# write comment
if ( $line =~ m/^\s*$/ )
{
$is_override = 0;
next;
}
elsif ( $line =~ m/\/\// || $line =~ m/\s*typedef / || $line =~ m/\s*struct / ){

3
tests/scripts/sipifyheader.expected.sip
View File

@ -207,6 +207,9 @@ Removing function body with virtual const reference
virtual int overrideWithoutVirtual();
virtual void overrideWithoutVirtualMultLine( const QList<int, QString> &list1,
const QList<int, QString> &list2 );
QString returnTypeString() const;
%Docstring
:rtype: str

3
tests/scripts/sipifyheader.h
View File

@ -225,6 +225,9 @@ class CORE_EXPORT QgsSipifyHeader : public QtClass<QVariant>, private Ui::QgsBas
int overrideWithoutVirtual() override;
void overrideWithoutVirtualMultLine( const QList<int, QString> &list1,
const QList<int, QString> &list2 ) override;
QString returnTypeString() const;
double returnTypeDouble() const;