Skip to content
Permalink
Browse files

follow up QVariant

  • Loading branch information
3nids committed Jan 3, 2021
1 parent f77bb21 commit 2cc632ee5da78beed4f67117771e10ca71814b62
Showing with 430 additions and 437 deletions.
  1. +3 −3 python/core/auto_generated/effects/qgsblureffect.sip.in
  2. +3 −3 python/core/auto_generated/effects/qgscoloreffect.sip.in
  3. +3 −3 python/core/auto_generated/effects/qgseffectstack.sip.in
  4. +4 −4 python/core/auto_generated/effects/qgsgloweffect.sip.in
  5. +5 −5 python/core/auto_generated/effects/qgspainteffect.sip.in
  6. +2 −2 python/core/auto_generated/effects/qgspainteffectregistry.sip.in
  7. +4 −4 python/core/auto_generated/effects/qgsshadoweffect.sip.in
  8. +3 −3 python/core/auto_generated/effects/qgstransformeffect.sip.in
  9. +1 −1 python/core/auto_generated/labeling/qgsrulebasedlabeling.sip.in
  10. +3 −3 python/core/auto_generated/labeling/qgsvectorlayerlabeling.sip.in
  11. +1 −1 python/core/auto_generated/raster/qgshillshaderenderer.sip.in
  12. +1 −1 python/core/auto_generated/raster/qgsmultibandcolorrenderer.sip.in
  13. +1 −1 python/core/auto_generated/raster/qgspalettedrasterrenderer.sip.in
  14. +1 −1 python/core/auto_generated/raster/qgsrasterlayer.sip.in
  15. +1 −1 python/core/auto_generated/raster/qgsrasterrenderer.sip.in
  16. +1 −1 python/core/auto_generated/raster/qgssinglebandgrayrenderer.sip.in
  17. +1 −1 python/core/auto_generated/raster/qgssinglebandpseudocolorrenderer.sip.in
  18. +2 −2 python/core/auto_generated/symbology/qgscategorizedsymbolrenderer.sip.in
  19. +3 −3 python/core/auto_generated/symbology/qgsellipsesymbollayer.sip.in
  20. +7 −7 python/core/auto_generated/symbology/qgsfillsymbollayer.sip.in
  21. +1 −1 python/core/auto_generated/symbology/qgsgeometrygeneratorsymbollayer.sip.in
  22. +1 −1 python/core/auto_generated/symbology/qgsgraduatedsymbolrenderer.sip.in
  23. +2 −2 python/core/auto_generated/symbology/qgslinesymbollayer.sip.in
  24. +5 −5 python/core/auto_generated/symbology/qgsmarkersymbollayer.sip.in
  25. +1 −1 python/core/auto_generated/symbology/qgspointdistancerenderer.sip.in
  26. +2 −2 python/core/auto_generated/symbology/qgsrenderer.sip.in
  27. +1 −1 python/core/auto_generated/symbology/qgsrendererrange.sip.in
  28. +2 −2 python/core/auto_generated/symbology/qgsrulebasedrenderer.sip.in
  29. +1 −1 python/core/auto_generated/symbology/qgssinglesymbolrenderer.sip.in
  30. +1 −1 python/core/auto_generated/symbology/qgssymbol.sip.in
  31. +3 −3 python/core/auto_generated/symbology/qgssymbollayer.sip.in
  32. +4 −4 python/core/auto_generated/symbology/qgssymbollayerregistry.sip.in
  33. +7 −7 python/core/auto_generated/symbology/qgssymbollayerutils.sip.in
  34. +1 −1 python/core/auto_generated/symbology/qgsvectorfieldsymbollayer.sip.in
  35. +1 −1 python/core/auto_generated/vector/qgsvectorlayer.sip.in
  36. +6 −6 src/core/effects/qgsblureffect.cpp
  37. +3 −3 src/core/effects/qgsblureffect.h
  38. +5 −5 src/core/effects/qgscoloreffect.cpp
  39. +3 −3 src/core/effects/qgscoloreffect.h
  40. +4 −4 src/core/effects/qgseffectstack.cpp
  41. +3 −3 src/core/effects/qgseffectstack.h
  42. +10 −10 src/core/effects/qgsgloweffect.cpp
  43. +4 −4 src/core/effects/qgsgloweffect.h
  44. +7 −34 src/core/effects/qgspainteffect.cpp
  45. +5 −5 src/core/effects/qgspainteffect.h
  46. +1 −1 src/core/effects/qgspainteffectregistry.cpp
  47. +4 −4 src/core/effects/qgspainteffectregistry.h
  48. +10 −10 src/core/effects/qgsshadoweffect.cpp
  49. +4 −4 src/core/effects/qgsshadoweffect.h
  50. +6 −6 src/core/effects/qgstransformeffect.cpp
  51. +3 −3 src/core/effects/qgstransformeffect.h
  52. +1 −1 src/core/labeling/qgslabelingengine.cpp
  53. +2 −2 src/core/labeling/qgsrulebasedlabeling.cpp
  54. +1 −1 src/core/labeling/qgsrulebasedlabeling.h
  55. +3 −3 src/core/labeling/qgsvectorlayerlabeling.cpp
  56. +3 −3 src/core/labeling/qgsvectorlayerlabeling.h
  57. +2 −2 src/core/layout/qgscompositionconverter.cpp
  58. +3 −3 src/core/layout/qgslayoutitemmapgrid.cpp
  59. +1 −1 src/core/layout/qgslayoutitemmarker.cpp
  60. +2 −2 src/core/layout/qgslayoutitemnodeitem.cpp
  61. +1 −1 src/core/layout/qgslayoutitempolyline.cpp
  62. +1 −1 src/core/mesh/qgsmeshlayer.cpp
  63. +12 −12 src/core/qgscolorramp.cpp
  64. +1 −1 src/core/qgsdiagramrenderer.cpp
  65. +1 −1 src/core/qgsmaplayer.cpp
  66. +1 −1 src/core/raster/qgshillshaderenderer.cpp
  67. +1 −1 src/core/raster/qgshillshaderenderer.h
  68. +1 −1 src/core/raster/qgsmultibandcolorrenderer.cpp
  69. +1 −1 src/core/raster/qgsmultibandcolorrenderer.h
  70. +1 −1 src/core/raster/qgspalettedrasterrenderer.cpp
  71. +1 −1 src/core/raster/qgspalettedrasterrenderer.h
  72. +2 −2 src/core/raster/qgsrasterlayer.cpp
  73. +1 −1 src/core/raster/qgsrasterlayer.h
  74. +1 −1 src/core/raster/qgsrasterrenderer.cpp
  75. +1 −1 src/core/raster/qgsrasterrenderer.h
  76. +1 −1 src/core/raster/qgssinglebandgrayrenderer.cpp
  77. +1 −1 src/core/raster/qgssinglebandgrayrenderer.h
  78. +1 −1 src/core/raster/qgssinglebandpseudocolorrenderer.cpp
  79. +1 −1 src/core/raster/qgssinglebandpseudocolorrenderer.h
  80. +2 −2 src/core/symbology/qgs25drenderer.cpp
  81. +5 −5 src/core/symbology/qgscategorizedsymbolrenderer.cpp
  82. +2 −2 src/core/symbology/qgscategorizedsymbolrenderer.h
  83. +27 −27 src/core/symbology/qgsellipsesymbollayer.cpp
  84. +3 −3 src/core/symbology/qgsellipsesymbollayer.h
  85. +31 −31 src/core/symbology/qgsfillsymbollayer.cpp
  86. +7 −7 src/core/symbology/qgsfillsymbollayer.h
  87. +2 −2 src/core/symbology/qgsgeometrygeneratorsymbollayer.cpp
  88. +1 −1 src/core/symbology/qgsgeometrygeneratorsymbollayer.h
  89. +2 −2 src/core/symbology/qgsgraduatedsymbolrenderer.cpp
  90. +1 −1 src/core/symbology/qgsgraduatedsymbolrenderer.h
  91. +8 −8 src/core/symbology/qgslinesymbollayer.cpp
  92. +2 −2 src/core/symbology/qgslinesymbollayer.h
  93. +14 −10 src/core/symbology/qgsmarkersymbollayer.cpp
  94. +5 −5 src/core/symbology/qgsmarkersymbollayer.h
  95. +2 −2 src/core/symbology/qgsmasksymbollayer.cpp
  96. +1 −1 src/core/symbology/qgspointdistancerenderer.cpp
  97. +1 −1 src/core/symbology/qgspointdistancerenderer.h
  98. +1 −1 src/core/symbology/qgsrenderer.cpp
  99. +2 −2 src/core/symbology/qgsrenderer.h
  100. +3 −3 src/core/symbology/qgsrendererrange.cpp
  101. +1 −1 src/core/symbology/qgsrendererrange.h
  102. +7 −7 src/core/symbology/qgsrulebasedrenderer.cpp
  103. +2 −2 src/core/symbology/qgsrulebasedrenderer.h
  104. +2 −2 src/core/symbology/qgssinglesymbolrenderer.cpp
  105. +1 −1 src/core/symbology/qgssinglesymbolrenderer.h
  106. +1 −1 src/core/symbology/qgssymbol.cpp
  107. +1 −1 src/core/symbology/qgssymbol.h
  108. +4 −4 src/core/symbology/qgssymbollayer.cpp
  109. +3 −3 src/core/symbology/qgssymbollayer.h
  110. +1 −1 src/core/symbology/qgssymbollayerregistry.cpp
  111. +6 −6 src/core/symbology/qgssymbollayerregistry.h
  112. +43 −27 src/core/symbology/qgssymbollayerutils.cpp
  113. +7 −7 src/core/symbology/qgssymbollayerutils.h
  114. +1 −1 src/core/symbology/qgsvectorfieldsymbollayer.cpp
  115. +1 −1 src/core/symbology/qgsvectorfieldsymbollayer.h
  116. +2 −2 src/core/textrenderer/qgstextrenderer.cpp
  117. +2 −2 src/core/vector/qgsvectorlayer.cpp
  118. +1 −1 src/core/vector/qgsvectorlayer.h
  119. +4 −4 src/gui/qgslegendpatchshapebutton.cpp
  120. +3 −3 src/gui/qgspropertyassistantwidget.cpp
  121. +4 −4 src/gui/qgssymbolbutton.cpp
  122. +1 −1 src/gui/symbology/qgsdatadefinedsizelegendwidget.cpp
@@ -29,7 +29,7 @@ methods.
GaussianBlur
};

static QgsPaintEffect *create( const QgsStringMap &map ) /Factory/;
static QgsPaintEffect *create( const QVariantMap &map ) /Factory/;
%Docstring
Creates a new QgsBlurEffect effect from a properties string map.

@@ -44,9 +44,9 @@ Constructor for QgsBlurEffect.
%End

virtual QString type() const;
virtual QgsStringMap properties() const;
virtual QVariantMap properties() const;

virtual void readProperties( const QgsStringMap &props );
virtual void readProperties( const QVariantMap &props );

virtual QgsBlurEffect *clone() const /Factory/;

@@ -23,7 +23,7 @@ source picture.
%End
public:

static QgsPaintEffect *create( const QgsStringMap &map ) /Factory/;
static QgsPaintEffect *create( const QVariantMap &map ) /Factory/;
%Docstring
Creates a new QgsColorEffect effect from a properties string map.

@@ -35,9 +35,9 @@ Creates a new QgsColorEffect effect from a properties string map.
QgsColorEffect();

virtual QString type() const;
virtual QgsStringMap properties() const;
virtual QVariantMap properties() const;

virtual void readProperties( const QgsStringMap &props );
virtual void readProperties( const QVariantMap &props );

virtual QgsColorEffect *clone() const /Factory/;

@@ -34,7 +34,7 @@ effect will be drawn using the original picture, not the blurred version.
%End
public:

static QgsPaintEffect *create( const QgsStringMap &map ) /Factory/;
static QgsPaintEffect *create( const QVariantMap &map ) /Factory/;
%Docstring
Creates a new QgsEffectStack effect. This method ignores
the map parameter, and always returns an empty effect stack.
@@ -72,13 +72,13 @@ Creates a new QgsEffectStack effect from a single initial effect.
virtual bool readProperties( const QDomElement &element );


virtual QgsStringMap properties() const;
virtual QVariantMap properties() const;

%Docstring
Unused for QgsEffectStack, will always return an empty string map
%End

virtual void readProperties( const QgsStringMap &props );
virtual void readProperties( const QVariantMap &props );

%Docstring
Unused for QgsEffectStack, props parameter will be ignored
@@ -35,9 +35,9 @@ picture.
QgsGlowEffect( const QgsGlowEffect &other );
~QgsGlowEffect();

virtual QgsStringMap properties() const;
virtual QVariantMap properties() const;

virtual void readProperties( const QgsStringMap &props );
virtual void readProperties( const QVariantMap &props );


void setSpread( const double spread );
@@ -359,7 +359,7 @@ A paint effect which draws a glow outside of a picture.
%End
public:

static QgsPaintEffect *create( const QgsStringMap &map ) /Factory/;
static QgsPaintEffect *create( const QVariantMap &map ) /Factory/;
%Docstring
Creates a new QgsOuterGlowEffect effect from a properties string map.

@@ -395,7 +395,7 @@ A paint effect which draws a glow within a picture.
%End
public:

static QgsPaintEffect *create( const QgsStringMap &map ) /Factory/;
static QgsPaintEffect *create( const QVariantMap &map ) /Factory/;
%Docstring
Creates a new QgsInnerGlowEffect effect from a properties string map.

@@ -107,7 +107,7 @@ Duplicates an effect by creating a deep copy of the effect
:return: clone of paint effect
%End

virtual QgsStringMap properties() const = 0;
virtual QVariantMap properties() const = 0;
%Docstring
Returns the properties describing the paint effect encoded in a
string format.
@@ -119,7 +119,7 @@ string format.
.. seealso:: :py:func:`saveProperties`
%End

virtual void readProperties( const QgsStringMap &props ) = 0;
virtual void readProperties( const QVariantMap &props ) = 0;
%Docstring
Reads a string map of an effect's properties and restores the effect
to the state described by the properties map.
@@ -342,7 +342,7 @@ If no alterations are performed then the original picture will be rendered as a
Constructor for QgsDrawSourceEffect
%End

static QgsPaintEffect *create( const QgsStringMap &map ) /Factory/;
static QgsPaintEffect *create( const QVariantMap &map ) /Factory/;
%Docstring
Creates a new QgsDrawSource effect from a properties string map.

@@ -354,9 +354,9 @@ Creates a new QgsDrawSource effect from a properties string map.
virtual QString type() const;
virtual QgsDrawSourceEffect *clone() const /Factory/;

virtual QgsStringMap properties() const;
virtual QVariantMap properties() const;

virtual void readProperties( const QgsStringMap &props );
virtual void readProperties( const QVariantMap &props );


void setOpacity( const double opacity );
@@ -57,7 +57,7 @@ Returns the user visible string representing the paint effect class
.. seealso:: :py:func:`name`
%End

virtual QgsPaintEffect *createPaintEffect( const QgsStringMap &map ) = 0 /Factory/;
virtual QgsPaintEffect *createPaintEffect( const QVariantMap &map ) = 0 /Factory/;
%Docstring
Create a paint effect of this class given an encoded map of properties.

@@ -119,7 +119,7 @@ Registers a new effect type.
:return: ``True`` if add was successful.
%End

QgsPaintEffect *createEffect( const QString &name, const QgsStringMap &properties = QgsStringMap() ) const /Factory/;
QgsPaintEffect *createEffect( const QString &name, const QVariantMap &properties = QVariantMap() ) const /Factory/;
%Docstring
Creates a new paint effect given the effect name and properties map.

@@ -24,9 +24,9 @@ Base class for paint effects which offset, blurred shadows

QgsShadowEffect();

virtual QgsStringMap properties() const;
virtual QVariantMap properties() const;

virtual void readProperties( const QgsStringMap &props );
virtual void readProperties( const QVariantMap &props );


void setBlurLevel( const double level );
@@ -308,7 +308,7 @@ A paint effect which draws an offset and optionally blurred drop shadow
%End
public:

static QgsPaintEffect *create( const QgsStringMap &map ) /Factory/;
static QgsPaintEffect *create( const QVariantMap &map ) /Factory/;
%Docstring
Creates a new QgsDropShadowEffect effect from a properties string map.

@@ -345,7 +345,7 @@ within a picture.
%End
public:

static QgsPaintEffect *create( const QgsStringMap &map ) /Factory/;
static QgsPaintEffect *create( const QVariantMap &map ) /Factory/;
%Docstring
Creates a new QgsInnerShadowEffect effect from a properties string map.

@@ -23,7 +23,7 @@ scale and rotate) to a picture.
%End
public:

static QgsPaintEffect *create( const QgsStringMap &map ) /Factory/;
static QgsPaintEffect *create( const QVariantMap &map ) /Factory/;
%Docstring
Creates a new QgsTransformEffect effect from a properties string map.

@@ -38,9 +38,9 @@ Constructor for QgsTransformEffect.
%End

virtual QString type() const;
virtual QgsStringMap properties() const;
virtual QVariantMap properties() const;

virtual void readProperties( const QgsStringMap &props );
virtual void readProperties( const QVariantMap &props );

virtual QgsTransformEffect *clone() const /Factory/;

@@ -312,7 +312,7 @@ Set pal settings for a specific provider (takes ownership).
%End
virtual bool requiresAdvancedEffects() const;

virtual void toSld( QDomNode &parent, const QgsStringMap &props ) const;
virtual void toSld( QDomNode &parent, const QVariantMap &props ) const;


protected:
@@ -89,7 +89,7 @@ or exported to a vector format.
Try to create instance of an implementation based on the XML data
%End

virtual void toSld( QDomNode &parent, const QgsStringMap &props ) const;
virtual void toSld( QDomNode &parent, const QVariantMap &props ) const;
%Docstring
Writes the SE 1.1 TextSymbolizer element based on the current layer labeling settings
%End
@@ -107,7 +107,7 @@ should be canceled.

protected:

virtual void writeTextSymbolizer( QDomNode &parent, QgsPalLayerSettings &settings, const QgsStringMap &props ) const;
virtual void writeTextSymbolizer( QDomNode &parent, QgsPalLayerSettings &settings, const QVariantMap &props ) const;
%Docstring
Writes a TextSymbolizer element contents based on the provided labeling settings

@@ -163,7 +163,7 @@ Set pal settings (takes ownership).

virtual bool requiresAdvancedEffects() const;

virtual void toSld( QDomNode &parent, const QgsStringMap &props ) const;
virtual void toSld( QDomNode &parent, const QVariantMap &props ) const;


static QgsVectorLayerSimpleLabeling *create( const QDomElement &element, const QgsReadWriteContext &context );
@@ -57,7 +57,7 @@ Factory method to create a new renderer
virtual QList<int> usesBands() const;


virtual void toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap &props = QgsStringMap() ) const;
virtual void toSld( QDomDocument &doc, QDomElement &element, const QVariantMap &props = QVariantMap() ) const;


int band() const;
@@ -124,7 +124,7 @@ Ownership of the enhancement is transferred.
virtual QList<QgsLayerTreeModelLegendNode *> createLegendNodes( QgsLayerTreeLayer *nodeLayer ) /Factory/;


virtual void toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap &props = QgsStringMap() ) const;
virtual void toSld( QDomDocument &doc, QDomElement &element, const QVariantMap &props = QVariantMap() ) const;


private:
@@ -92,7 +92,7 @@ Returns the raster band used for rendering the raster.

virtual QList<int> usesBands() const;

virtual void toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap &props = QgsStringMap() ) const;
virtual void toSld( QDomDocument &doc, QDomElement &element, const QVariantMap &props = QVariantMap() ) const;

virtual bool accept( QgsStyleEntityVisitorInterface *visitor ) const;

@@ -411,7 +411,7 @@ Draws a preview of the rasterlayer into a QImage
virtual bool accept( QgsStyleEntityVisitorInterface *visitor ) const;


bool writeSld( QDomNode &node, QDomDocument &doc, QString &errorMessage, const QgsStringMap &props = QgsStringMap() ) const;
bool writeSld( QDomNode &node, QDomDocument &doc, QString &errorMessage, const QVariantMap &props = QVariantMap() ) const;
%Docstring
Writes the symbology of the layer into the document provided in SLD 1.0.0 format

@@ -153,7 +153,7 @@ Returns const reference to origin of min/max values
Sets origin of min/max values
%End

virtual void toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap &props = QgsStringMap() ) const;
virtual void toSld( QDomDocument &doc, QDomElement &element, const QVariantMap &props = QVariantMap() ) const;
%Docstring
Used from subclasses to create SLD Rule elements following SLD v1.0 specs

@@ -63,7 +63,7 @@ Takes ownership
virtual QList<int> usesBands() const;


virtual void toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap &props = QgsStringMap() ) const;
virtual void toSld( QDomDocument &doc, QDomElement &element, const QVariantMap &props = QVariantMap() ) const;


const QgsColorRampLegendNodeSettings *legendSettings() const;
@@ -81,7 +81,7 @@ Creates a color ramp shader

virtual QList<int> usesBands() const;

virtual void toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap &props = QgsStringMap() ) const;
virtual void toSld( QDomDocument &doc, QDomElement &element, const QVariantMap &props = QVariantMap() ) const;

virtual bool accept( QgsStyleEntityVisitorInterface *visitor ) const;

@@ -117,7 +117,7 @@ Sets whether the category is currently enabled and should be rendered.
Returns a string representing the categories settings, used for debugging purposes only.
%End

void toSld( QDomDocument &doc, QDomElement &element, QgsStringMap props ) const;
void toSld( QDomDocument &doc, QDomElement &element, QVariantMap props ) const;
%Docstring
Converts the category to a matching SLD rule, within the specified DOM document and ``element``.
%End
@@ -164,7 +164,7 @@ can be added later by calling :py:func:`~QgsCategorizedSymbolRenderer.addCategor

virtual QgsCategorizedSymbolRenderer *clone() const /Factory/;

virtual void toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap &props = QgsStringMap() ) const;
virtual void toSld( QDomDocument &doc, QDomElement &element, const QVariantMap &props = QVariantMap() ) const;

virtual QgsFeatureRenderer::Capabilities capabilities();
virtual QString filter( const QgsFields &fields = QgsFields() );
@@ -21,7 +21,7 @@ A symbol layer for rendering objects with major and minor axis (e.g. ellipse, re
public:
QgsEllipseSymbolLayer();

static QgsSymbolLayer *create( const QgsStringMap &properties = QgsStringMap() ) /Factory/;
static QgsSymbolLayer *create( const QVariantMap &properties = QVariantMap() ) /Factory/;
static QgsSymbolLayer *createFromSld( QDomElement &element ) /Factory/;

virtual void renderPoint( QPointF point, QgsSymbolRenderContext &context );
@@ -37,9 +37,9 @@ A symbol layer for rendering objects with major and minor axis (e.g. ellipse, re
virtual QVariantMap properties() const;


virtual void toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap &props ) const;
virtual void toSld( QDomDocument &doc, QDomElement &element, const QVariantMap &props ) const;

virtual void writeSldMarker( QDomDocument &doc, QDomElement &element, const QgsStringMap &props ) const;
virtual void writeSldMarker( QDomDocument &doc, QDomElement &element, const QVariantMap &props ) const;


virtual bool writeDxf( QgsDxfExport &e, double mmMapUnitScaleFactor, const QString &layerName, QgsSymbolRenderContext &context, QPointF shift = QPointF( 0.0, 0.0 ) ) const;

0 comments on commit 2cc632e

Please sign in to comment.
You can’t perform that action at this time.