[sipify] fix enum again

qgis · Jun 9, 2017 · f5c3b8a · f5c3b8a
1 parent 532b9a1
commit f5c3b8a
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/python/core/layertree/qgslayertreemodellegendnode.sip b/python/core/layertree/qgslayertreemodellegendnode.sip
@@ -31,7 +31,7 @@ class QgsLayerTreeModelLegendNode : QObject
 
     enum LegendNodeRoles
     {
-      RuleKeyRole
+      RuleKeyRole,
       ParentRuleKeyRole
     };
 

diff --git a/python/core/qgsbrowsermodel.sip b/python/core/qgsbrowsermodel.sip
@@ -21,8 +21,8 @@ class QgsBrowserModel : QAbstractItemModel
 
     enum ItemDataRole
     {
-      PathRole
-      CommentRole
+      PathRole,
+      CommentRole,
     };
 
     virtual Qt::ItemFlags flags( const QModelIndex &index ) const;

diff --git a/python/core/qgsfieldmodel.sip b/python/core/qgsfieldmodel.sip
@@ -27,14 +27,14 @@ class QgsFieldModel : QAbstractItemModel
 
     enum FieldRoles
     {
-      FieldNameRole
-      FieldIndexRole
-      ExpressionRole
-      IsExpressionRole
-      ExpressionValidityRole
-      FieldTypeRole
-      FieldOriginRole
-      IsEmptyRole
+      FieldNameRole,
+      FieldIndexRole,
+      ExpressionRole,
+      IsExpressionRole,
+      ExpressionValidityRole,
+      FieldTypeRole,
+      FieldOriginRole,
+      IsEmptyRole,
     };
 
     explicit QgsFieldModel( QObject *parent /TransferThis/ = 0 );

diff --git a/python/core/qgsmaplayermodel.sip b/python/core/qgsmaplayermodel.sip
@@ -27,7 +27,7 @@ class QgsMapLayerModel : QAbstractItemModel
 
     enum ItemDataRole
     {
-      LayerIdRole
+      LayerIdRole,
       LayerRole,
       EmptyRole,
       AdditionalRole,

diff --git a/python/core/qgsstringutils.sip b/python/core/qgsstringutils.sip
@@ -161,10 +161,10 @@ class QgsStringUtils
 
     enum Capitalization
     {
-      MixedCase
-      AllUppercase
-      AllLowercase
-      ForceFirstLetterToCapital
+      MixedCase,
+      AllUppercase,
+      AllLowercase,
+      ForceFirstLetterToCapital,
     };
 
     static QString capitalize( const QString &string, Capitalization capitalization );

diff --git a/scripts/sipify.pl b/scripts/sipify.pl
@@ -622,7 +622,7 @@ sub detect_comment_block{
                     last;
                 }
                 do {no warnings 'uninitialized';
-                    my $enum_decl = $LINE =~ s/(\s*\w+)(\s+SIP_\w+(?:\([^()]+\))?)?(?:\s*=\s*[\w\s\d<|-]+.*?)?(,?).*$/$1$2$3/r;
+                    my $enum_decl = $LINE =~ s/(\s*\w+)(\s+SIP_\w+(?:\([^()]+\))?)?(?:\s*=\s*(?:[\w\s\d|+-]|::|<<)+.*?)?(,?).*$/$1$2$3/r;
                     $enum_decl = fix_annotations($enum_decl);
                     write_output("ENU3", "$enum_decl\n");
                 };