Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Add missing /Transfer/s to setSubSymbol
(cherry-picked from dc0639c)
  • Loading branch information
nyalldawson committed Nov 18, 2015
1 parent 509a285 commit 4ea5848
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions python/core/symbology-ng/qgsfillsymbollayerv2.sip
Expand Up @@ -438,7 +438,7 @@ class QgsImageFillSymbolLayer: QgsFillSymbolLayerV2
void renderPolygon( const QPolygonF& points, QList<QPolygonF>* rings, QgsSymbolV2RenderContext& context );

virtual QgsSymbolV2* subSymbol();
virtual bool setSubSymbol( QgsSymbolV2* symbol );
virtual bool setSubSymbol( QgsSymbolV2* symbol /Transfer/ );

void setOutlineWidthUnit( QgsSymbolV2::OutputUnit unit );
QgsSymbolV2::OutputUnit outlineWidthUnit() const;
Expand Down Expand Up @@ -495,7 +495,7 @@ class QgsRasterFillSymbolLayer: QgsImageFillSymbolLayer

//override QgsImageFillSymbolLayer's support for sub symbols
virtual QgsSymbolV2* subSymbol();
virtual bool setSubSymbol( QgsSymbolV2* symbol );
virtual bool setSubSymbol( QgsSymbolV2* symbol /Transfer/ );

/** Sets the path to the raster image used for the fill.
* @param imagePath path to image file
Expand Down Expand Up @@ -758,7 +758,7 @@ class QgsLinePatternFillSymbolLayer: QgsImageFillSymbolLayer
void setMapUnitScale( const QgsMapUnitScale& scale );
QgsMapUnitScale mapUnitScale() const;

bool setSubSymbol( QgsSymbolV2* symbol );
bool setSubSymbol( QgsSymbolV2* symbol /Transfer/ );
QgsSymbolV2* subSymbol();

QSet<QString> usedAttributes() const;
Expand Down Expand Up @@ -804,7 +804,7 @@ class QgsPointPatternFillSymbolLayer : QgsImageFillSymbolLayer
double displacementY() const;
void setDisplacementY( double d );

bool setSubSymbol( QgsSymbolV2* symbol );
bool setSubSymbol( QgsSymbolV2* symbol /Transfer/ );
virtual QgsSymbolV2* subSymbol();

void setDistanceXUnit( QgsSymbolV2::OutputUnit unit );
Expand Down
2 changes: 1 addition & 1 deletion python/core/symbology-ng/qgslinesymbollayerv2.sip
Expand Up @@ -128,7 +128,7 @@ class QgsMarkerLineSymbolLayerV2 : QgsLineSymbolLayerV2
void setColor( const QColor& color );

QgsSymbolV2* subSymbol();
bool setSubSymbol( QgsSymbolV2* symbol );
bool setSubSymbol( QgsSymbolV2* symbol /Transfer/);

virtual void setWidth( double width );
virtual double width() const;
Expand Down

0 comments on commit 4ea5848

Please sign in to comment.