Skip to content

Commit fc796b4

Browse files
committedMay 20, 2021
Fix sipify
1 parent ae87751 commit fc796b4

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed
 

‎scripts/sipify.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1072,7 +1072,7 @@ sub detect_non_method_member{
10721072
next if ($LINE =~ m/^\s*\w+\s*\|/); # multi line declaration as sum of enums
10731073

10741074
do {no warnings 'uninitialized';
1075-
my $enum_decl = $LINE =~ s/^(\s*(?<em>\w+))(\s+SIP_\w+(?:\(\s*(?<compat>[^() ]+)\s*\)\s*)?)?(?:\s*=\s*(?:[\w\s\d|+-]|::|<<)+)?(,?)(:?\s*\/\/!<\s*(?<co>.*)|.*)$/$1$5/r;
1075+
my $enum_decl = $LINE =~ s/^(\s*(?<em>\w+))(\s+SIP_PYNAME(?:\(\s*(?<pyname>[^() ]+)\s*\)\s*)?)?(\s+SIP_MONKEY\w+(?:\(\s*(?<compat>[^() ]+)\s*\)\s*)?)?(?:\s*=\s*(?:[\w\s\d|+-]|::|<<)+)?(,?)(:?\s*\/\/!<\s*(?<co>.*)|.*)$/$1$3$7/r;
10761076
my $enum_member = $+{em};
10771077
my $comment = $+{co};
10781078
my $compat_name = $+{compat} ? $+{compat} : $enum_member;

‎tests/code_layout/sipifyheader.expected.sip

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@ typedef QtClass<QVariant> QtClassQVariantBase;
9191
ImaginarySuccess,
9292
RecursiveSuccess,
9393
SuccessCombination,
94-
PythonName,
94+
PythonName /PyName=DifferentName/,
95+
MonkeyName,
9596
};
9697
typedef QFlags<QgsSipifyHeader::MyEnum> Flags;
9798

‎tests/code_layout/sipifyheader.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ class CORE_EXPORT QgsSipifyHeader : public QtClass<QVariant>, private Ui::QgsBas
115115
RecursiveSuccess = 1 << 4, //!< Edit operation resulted in an n-dimensional wormhole
116116
SuccessCombination = Success | ImaginarySuccess, //!< Holy Graal
117117
PythonName SIP_PYNAME( DifferentName ), //!< Different python name
118+
MonkeyName SIP_MONKEYPATCH_COMPAT_NAME( MonkeyPatchName ), //!< Monkey patched compatibility name
118119
};
119120
Q_DECLARE_FLAGS( Flags, MyEnum )
120121

0 commit comments

Comments
 (0)
Please sign in to comment.