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

also "s/( )/()/;" in sipify.pl (followup 4f9a9e036)

Browse Source
This commit is contained in:
Juergen E. Fischer 2017-07-19 10:34:46 +02:00
parent 0665072d94
commit c29fc35155
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/sipify.pl
View File

@ -253,6 +253,7 @@ sub fix_annotations {
}
# see https://regex101.com/r/5iNptO/4
$line =~ s/(?<coma>, +)?(const )?(\w+)(\<(?>[^<>]|(?4))*\>)?\s+[\w&*]+\s+SIP_PYARGREMOVE( = [^()]*(\(\s*(?:[^()]++|(?6))*\s*\))?)?(?(<coma>)|,?)//g;
$line =~ s/\(\s+\)/()/;
}
$line =~ s/SIP_FORCE//;
return $line;

4
tests/code_layout/sipifyheader.expected.sip
View File

@ -304,7 +304,7 @@ Mulitline body
void combinedAnnotations() /Factory,PyName=otherName/;
void multiAnnotationArg( SomeClass **object /Out,TransferBack/, int &another /Out/ );
void simple( );
void simple();
%Docstring
remove argument
%End
@ -312,7 +312,7 @@ remove argument
void test( );
void avoidIntersections( const QList<QgsVectorLayer *> &avoidIntersectionsLayers );
void position( );
void position();
void position( bool keep );
void position( bool keep, bool keep );
void position( bool keep );

2
tests/code_layout/sipifyheader.h
View File

@ -333,7 +333,7 @@ class CORE_EXPORT QgsSipifyHeader : public QtClass<QVariant>, private Ui::QgsBas
//! remove argument
void simple( bool test SIP_PYARGREMOVE );
void method( bool myArg SIP_PYARGREMOVE = test );
void method( bool myArg SIP_PYARGREMOVE = test );
void test( QgsMapLayer *vl SIP_PYARGREMOVE = nullptr );
void avoidIntersections( const QList<QgsVectorLayer *> &avoidIntersectionsLayers,
const QHash<QgsVectorLayer *, QSet<QgsFeatureId> > &ignoreFeatures SIP_PYARGREMOVE = ( QHash<QgsVectorLayer *, QSet<QgsFeatureId> >() ) );