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

[sipify] handle SIP_SKIP on several lines

Browse Source
This commit is contained in:
Denis Rouzaud 2017-04-20 14:37:22 +02:00
parent 1ab5a628df
commit f022858643
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/sipify.pl
View File

@ -189,6 +189,15 @@ while ($line_idx < $line_count){
# SIP_SKIP # SIP_SKIP
if ( $line =~ m/SIP_SKIP/ ){ if ( $line =~ m/SIP_SKIP/ ){
$comment = ''; $comment = '';
# if multiline definition, remove previous lines
if ( $MULTILINE_DEFINITION == 1){
my $opening_line = '';
while ( $opening_line !~ m/^[^()]*\(([^()]*\([^()]*\)[^()]*)*[^()]*$/){
$opening_line = pop(@output);
$#output >= 0 or die 'could not reach opening definition';
}
$MULTILINE_DEFINITION = 0;
}
next; next;
} }

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

@ -120,6 +120,7 @@ A multiline method signature
void nonAnnotatedMethodFollowingSkip(); void nonAnnotatedMethodFollowingSkip();
virtual QgsMapLayerRenderer *createMapRenderer( QgsRenderContext &rendererContext ) /Factory/; virtual QgsMapLayerRenderer *createMapRenderer( QgsRenderContext &rendererContext ) /Factory/;
%Docstring %Docstring
Factory annotation Factory annotation

4
tests/scripts/sipifyheader.h
View File

@ -163,6 +163,10 @@ class CORE_EXPORT QgsSipifyHeader : public QtClass<QVariant>, private Ui::QgsBas
void nonAnnotatedMethodFollowingSkip(); void nonAnnotatedMethodFollowingSkip();
bool myMultiLineSkipped( const QList<int, QString> &list1,
const QList<int, QString> &list2,
const QList<int, QString> &list3 ) SIP_SKIP;
//! Factory annotation //! Factory annotation
virtual QgsMapLayerRenderer *createMapRenderer( QgsRenderContext &rendererContext ) override SIP_FACTORY; virtual QgsMapLayerRenderer *createMapRenderer( QgsRenderContext &rendererContext ) override SIP_FACTORY;