Fix sipify

qgis · Mar 27, 2021 · 6ca82a2 · 6ca82a2
1 parent 10e9de1
commit 6ca82a2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/python/core/auto_generated/symbology/qgsrendererrange.sip.in b/python/core/auto_generated/symbology/qgsrendererrange.sip.in
@@ -75,14 +75,18 @@ typedef QList<QgsRendererRange> QgsRangeList;
 
 
 class QgsRendererRangeLabelFormat /Deprecated/
-%Docstring
+{
+%Docstring(signature="appended")
 
 .. versionadded:: 2.6
 
 .. deprecated:: QGIS 3.10
   use :py:class:`QgsClassificationMethod` instead
 %End
-{
+
+%TypeHeaderCode
+#include "qgsrendererrange.h"
+%End
   public:
     QgsRendererRangeLabelFormat();
     QgsRendererRangeLabelFormat( const QString &format, int precision = 4, bool trimTrailingZeroes = false );

diff --git a/scripts/sipify.pl b/scripts/sipify.pl
@@ -850,7 +850,7 @@ sub detect_non_method_member{
 
     # class declaration started
     # https://regex101.com/r/6FWntP/16
-    if ( $LINE =~ m/^(\s*(class))(\s+Q_DECL_DEPRECATED)?\s+([A-Z0-9_]+_EXPORT\s+)?(?<classname>\w+)(?<domain>\s*\:\s*(public|protected|private)\s+\w+(< *(\w|::)+ *>)?(::\w+(<\w+>)?)*(,\s*(public|protected|private)\s+\w+(< *(\w|::)+ *>)?(::\w+(<\w+>)?)*)*)?(?<annot>\s*\/?\/?\s*SIP_\w+)?\s*?(\/\/.*|(?!;))$/ ){
+    if ( $LINE =~ m/^(\s*(class))\s+([A-Z0-9_]+_EXPORT\s+)?(Q_DECL_DEPRECATED\s+)?(?<classname>\w+)(?<domain>\s*\:\s*(public|protected|private)\s+\w+(< *(\w|::)+ *>)?(::\w+(<\w+>)?)*(,\s*(public|protected|private)\s+\w+(< *(\w|::)+ *>)?(::\w+(<\w+>)?)*)*)?(?<annot>\s*\/?\/?\s*SIP_\w+)?\s*?(\/\/.*|(?!;))$/ ){
         dbg_info("class definition started");
         push @ACCESS, PUBLIC;
         push @EXPORTED, 0;