[qt6] compatibility with [[deprecated]] attribute

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

Hide file tree

Showing 6 changed files with 7 additions and 11 deletions.
diff --git a/python/core/auto_generated/qgsmaprenderercache.sip.in b/python/core/auto_generated/qgsmaprenderercache.sip.in
@@ -44,7 +44,7 @@ Invalidates the cache contents, clearing all cached images.
 .. seealso:: :py:func:`clearCacheImage`
 %End
 
-    bool init( const QgsRectangle &extent, double scale ) /Deprecated/;
+ bool init( const QgsRectangle &extent, double scale ) /Deprecated/;
 %Docstring
 Initialize cache: sets extent and scale parameters and clears the cache if any
 parameters have changed since last initialization.

diff --git a/python/core/auto_generated/symbology/qgsgraduatedsymbolrenderer.sip.in b/python/core/auto_generated/symbology/qgsgraduatedsymbolrenderer.sip.in
@@ -305,7 +305,7 @@ Reset the label decimal places to a numberbased on the minimum class interval
 %End
 
 
-    static QgsGraduatedSymbolRenderer *createRenderer( QgsVectorLayer *vlayer,
+ static QgsGraduatedSymbolRenderer *createRenderer( QgsVectorLayer *vlayer,
         const QString &attrName,
         int classes,
         Mode mode,

diff --git a/python/core/auto_generated/symbology/qgsrendererrange.sip.in b/python/core/auto_generated/symbology/qgsrendererrange.sip.in
@@ -75,18 +75,14 @@ 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/src/core/qgsmaprenderercache.h b/src/core/qgsmaprenderercache.h
@@ -63,7 +63,7 @@ class CORE_EXPORT QgsMapRendererCache : public QObject
      * \returns flag whether the parameters are the same as last time
      * \deprecated since QGIS 3.18 - will be removed in QGIS 4.0. Use the updateParameters() and clear()
      */
-    bool Q_DECL_DEPRECATED init( const QgsRectangle &extent, double scale ) SIP_DEPRECATED;
+    Q_DECL_DEPRECATED bool init( const QgsRectangle &extent, double scale ) SIP_DEPRECATED;
 
     /**
      * Sets extent and scale parameters

diff --git a/src/core/symbology/qgsgraduatedsymbolrenderer.h b/src/core/symbology/qgsgraduatedsymbolrenderer.h
@@ -271,7 +271,7 @@ class CORE_EXPORT QgsGraduatedSymbolRenderer : public QgsFeatureRenderer
      * \returns new QgsGraduatedSymbolRenderer object
      * \deprecated since QGIS 3.10
      */
-    static Q_DECL_DEPRECATED QgsGraduatedSymbolRenderer *createRenderer( QgsVectorLayer *vlayer,
+    Q_DECL_DEPRECATED static QgsGraduatedSymbolRenderer *createRenderer( QgsVectorLayer *vlayer,
         const QString &attrName,
         int classes,
         Mode mode,

diff --git a/src/core/symbology/qgsrendererrange.h b/src/core/symbology/qgsrendererrange.h
@@ -104,7 +104,7 @@ typedef QList<QgsRendererRange> QgsRangeList;
  * \since QGIS 2.6
  * \deprecated since QGIS 3.10, use QgsClassificationMethod instead
  */
-class Q_DECL_DEPRECATED CORE_EXPORT QgsRendererRangeLabelFormat SIP_DEPRECATED
+class CORE_EXPORT Q_DECL_DEPRECATED QgsRendererRangeLabelFormat SIP_DEPRECATED
 {
   public:
     QgsRendererRangeLabelFormat();