Skip to content
Permalink
Browse files
[sipify] fix enum combination
  • Loading branch information
3nids committed Apr 19, 2017
1 parent 55860e8 commit 51aa44de5f4a9afc1c112df3972db69ba7979e1c
Showing with 4 additions and 2 deletions.
  1. +1 −1 python/core/processing/qgsprocessingalgorithm.sip
  2. +1 −1 scripts/sipify.pl
  3. +1 −0 tests/scripts/sipifyheader.expected.sip
  4. +1 −0 tests/scripts/sipifyheader.h
@@ -27,7 +27,7 @@ class QgsProcessingAlgorithm
FlagHideFromToolbox,
FlagHideFromModeler,
FlagSupportsBatch,
FlagDeprecated
FlagDeprecated,
};
typedef QFlags<QgsProcessingAlgorithm::Flag> Flags;

@@ -289,7 +289,7 @@ sub processDoxygenLine
if ($line =~ m/\};/){
last;
}
$line =~ s/(\s*\w+)(\s*=\s*[\w\s\d<]+.*?)?(,?).*$/$1$3/;
$line =~ s/(\s*\w+)(\s*=\s*[\w\s\d<|]+.*?)?(,?).*$/$1$3/;
print $line;
}
print $line;
@@ -64,6 +64,7 @@ class QgsSipifyHeader : QtClass<QVariant>
NoSuccess,
ImaginarySuccess,
RecursiveSuccess,
SuccessCombination,
};
typedef QFlags<QgsSipifyHeader::MyEnum> Flags;

@@ -102,6 +102,7 @@ class CORE_EXPORT QgsSipifyHeader : public QtClass<QVariant>, private Ui::QgsBas
NoSuccess = 1, //!< Edit operation resulted in an empty geometry
ImaginarySuccess = 1 << 3, //!< Edit operation resulted in an imaginary geometry
RecursiveSuccess = 1 << 4, //!< Edit operation resulted in an n-dimensional wormhole
SuccessCombination = Success | ImaginarySuccess, //!< Holy Graal
};
Q_DECLARE_FLAGS( Flags, MyEnum )

0 comments on commit 51aa44d

Please sign in to comment.