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

[sipify] fix enum combination

Browse Source
This commit is contained in:
Denis Rouzaud 2017-04-19 15:03:31 +02:00
parent 55860e8508
commit 51aa44de5f
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/core/processing/qgsprocessingalgorithm.sip
View File

@ -27,7 +27,7 @@ class QgsProcessingAlgorithm
FlagHideFromToolbox,
FlagHideFromModeler,
FlagSupportsBatch,
FlagDeprecated
FlagDeprecated,
};
typedef QFlags<QgsProcessingAlgorithm::Flag> Flags;

2
scripts/sipify.pl
View File

@ -289,7 +289,7 @@ while(!eof $header){
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;

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

@ -64,6 +64,7 @@ class QgsSipifyHeader : QtClass<QVariant>
NoSuccess,
ImaginarySuccess,
RecursiveSuccess,
SuccessCombination,
};
typedef QFlags<QgsSipifyHeader::MyEnum> Flags;

1
tests/scripts/sipifyheader.h
View File

@ -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 )