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

fix sipify

Browse Source
This commit is contained in:
Denis Rouzaud 2019-08-29 18:26:12 +02:00 committed by GitHub
parent ffad801fad
commit c1e8cf8f19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -957,7 +957,7 @@ while ($LINE_IDX < $LINE_COUNT){
# Enum declaration # Enum declaration
# For scoped and type based enum, the type has to be removed # For scoped and type based enum, the type has to be removed
if ( $LINE =~ m/^(\s*enum(\s+Q_DECL_DEPRECATED)?\s+(class\s+)?(?<enum_qualname>\w+))(:?\s+SIP_.*)?(\s*:\s*\w+)?(?<oneliner>.*)$/ ){ if ( $LINE =~ m/^(\s*enum(\s+Q_DECL_DEPRECATED)?\s+(?<isclass>class\s+)?(?<enum_qualname>\w+))(:?\s+SIP_.*)?(\s*:\s*\w+)?(?<oneliner>.*)$/ ){
my $enum_decl = $1; my $enum_decl = $1;
$enum_decl =~ s/\s*\bQ_DECL_DEPRECATED\b//; $enum_decl =~ s/\s*\bQ_DECL_DEPRECATED\b//;
write_output("ENU1", "$enum_decl"); write_output("ENU1", "$enum_decl");
@ -965,7 +965,7 @@ while ($LINE_IDX < $LINE_COUNT){
write_output("ENU1", "\n"); write_output("ENU1", "\n");
my $enum_qualname = $+{enum_qualname}; my $enum_qualname = $+{enum_qualname};
my $is_scope_based = "0"; my $is_scope_based = "0";
$is_scope_based = "1" if defined $2; $is_scope_based = "1" if defined $+{isclass};
my $monkeypatch = "0"; my $monkeypatch = "0";
$monkeypatch = "1" if defined $is_scope_based eq "1" and $LINE =~ m/SIP_MONKEYPATCH_SCOPEENUM(_UNNEST)?(:?\(\s*(?<emkb>\w+)\s*,\s*(?<emkf>\w+)\s*\))?/; $monkeypatch = "1" if defined $is_scope_based eq "1" and $LINE =~ m/SIP_MONKEYPATCH_SCOPEENUM(_UNNEST)?(:?\(\s*(?<emkb>\w+)\s*,\s*(?<emkf>\w+)\s*\))?/;
my $enum_mk_base = ""; my $enum_mk_base = "";