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

sipify.pl: consider structs in exported classes also exported

Browse Source
This commit is contained in:
Juergen E. Fischer 2017-05-21 10:09:57 +02:00
parent 551a907329
commit 212d07f3a2
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/sipify.pl
View File

@ -392,10 +392,10 @@ while ($line_idx < $line_count){
pop(@global_bracket_nesting_index);
pop(@ACCESS);
die "Class $classname in $headerfile should be exported with appropriate [LIB]_EXPORT macro. If this should not be available in python, wrap it in a `#ifndef SIP_RUN` block."
if $EXPORTED[-1] == 0;
die "Class $classname in $headerfile should be exported with appropriate [LIB]_EXPORT macro. If this should not be available in python, wrap it in a `#ifndef SIP_RUN` block."
if $EXPORTED[-1] == 0;
pop @EXPORTED;
pop @EXPORTED;
}
if ($#ACCESS == 0){
dbg_info("reached top level");
@ -461,7 +461,7 @@ while ($line_idx < $line_count){
if ( $line =~ m/^\s*struct(\s+\w+_EXPORT)?\s+\w+$/ ) {
dbg_info(" going to struct => public");
push @ACCESS, PUBLIC;
push @EXPORTED, 0;
push @EXPORTED, $EXPORTED[-1];
push @global_bracket_nesting_index, 0;
}
@ -476,7 +476,7 @@ while ($line_idx < $line_count){
my @template_inheritance_class = ();
do {no warnings 'uninitialized';
$classname = $3;
$EXPORTED[-1]++ if $line =~ m/\b[A-Z]+_EXPORT\b/;
$EXPORTED[-1]++ if $line =~ m/\b[A-Z]+_EXPORT\b/;
};
$line = "$1 $3";
# Inheritance
@ -634,10 +634,10 @@ while ($line_idx < $line_count){
$line =~ s/\bnullptr\b/0/g;
$line =~ s/\s*=\s*default\b//g;
if( $line =~ /\w+_EXPORT/ ) {
$EXPORTED[-1]++;
$line =~ s/\b\w+_EXPORT\s+//g;
}
if( $line =~ /\w+_EXPORT/ ) {
$EXPORTED[-1]++;
$line =~ s/\b\w+_EXPORT\s+//g;
}
# remove constructor definition, function bodies, member initializing list
$SIP_RUN == 1 or detect_and_remove_following_body_or_initializerlist();