Skip to content

Commit 0324de3

Browse files
nyalldawsonnyalldawson
committed
Remove QgsSymbolLayerV2Utils::encodeOutputUnit() and decodeOutputUnit()
QgsUnitTypes::encodeUnit() and QgsUnitTypes::decodeRenderUnit() should be used instead.
1 parent ce6bd6c commit 0324de3

17 files changed

+128
-162
lines changed

‎doc/api_break.dox

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,12 @@ parameters or QgsSymbolV2::OutputUnitList parameters now take QgsUnitTypes::Rend
456456
<li>subsetString() was made const. This has no effect on PyQGIS code, but c++ code implementing derived layer classes will need to update the signature of this method to match.</li>
457457
</ul>
458458

459+
\subsection qgis_api_break_3_0_QgsSymbolLayerV2Utils QgsSymbolLayerV2Utils
460+
461+
<ul>
462+
<li>encodeOutputUnit() and decodeOutputUnit() were removed. QgsUnitTypes::encodeUnit() and QgsUnitTypes::decodeRenderUnit() should be used instead.</li>
463+
</ul>
464+
459465
\subsection qgis_api_break_3_0_QgsTreeWidgetItem QgsTreeWidgetItem
460466

461467
<ul>

‎python/core/symbology-ng/qgssymbollayerv2utils.sip

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@ class QgsSymbolLayerV2Utils
5151
static QString encodeSldRealVector( const QVector<qreal>& v );
5252
static QVector<qreal> decodeSldRealVector( const QString& s );
5353

54-
static QString encodeOutputUnit( QgsUnitTypes::RenderUnit unit );
55-
static QgsUnitTypes::RenderUnit decodeOutputUnit( const QString& str );
56-
5754
static QString encodeSldUom( QgsUnitTypes::RenderUnit unit, double *scaleFactor );
5855
static QgsUnitTypes::RenderUnit decodeSldUom( const QString& str, double *scaleFactor );
5956

‎src/app/qgsdecorationitem.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,14 @@ void QgsDecorationItem::projectRead()
6666
{
6767
mEnabled = QgsProject::instance()->readBoolEntry( mNameConfig, "/Enabled", false );
6868
mPlacement = static_cast< Placement >( QgsProject::instance()->readNumEntry( mNameConfig, "/Placement", static_cast< int >( mPlacement ) ) );
69-
mMarginUnit = QgsSymbolLayerV2Utils::decodeOutputUnit( QgsProject::instance()->readEntry( mNameConfig, "/MarginUnit", QgsSymbolLayerV2Utils::encodeOutputUnit( mMarginUnit ) ) );
69+
mMarginUnit = QgsUnitTypes::decodeRenderUnit( QgsProject::instance()->readEntry( mNameConfig, "/MarginUnit", QgsUnitTypes::encodeUnit( mMarginUnit ) ) );
7070
}
7171

7272
void QgsDecorationItem::saveToProject()
7373
{
7474
QgsProject::instance()->writeEntry( mNameConfig, "/Enabled", mEnabled );
7575
QgsProject::instance()->writeEntry( mNameConfig, "/Placement", static_cast< int >( mPlacement ) );
76-
QgsProject::instance()->writeEntry( mNameConfig, "/MarginUnit", QgsSymbolLayerV2Utils::encodeOutputUnit( mMarginUnit ) );
76+
QgsProject::instance()->writeEntry( mNameConfig, "/MarginUnit", QgsUnitTypes::encodeUnit( mMarginUnit ) );
7777
}
7878

7979
void QgsDecorationItem::setName( const char *name )

‎src/core/effects/qgsgloweffect.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ QgsStringMap QgsGlowEffect::properties() const
124124
props.insert( "transparency", QString::number( mTransparency ) );
125125
props.insert( "blur_level", QString::number( mBlurLevel ) );
126126
props.insert( "spread", QString::number( mSpread ) );
127-
props.insert( "spread_unit", QgsSymbolLayerV2Utils::encodeOutputUnit( mSpreadUnit ) );
127+
props.insert( "spread_unit", QgsUnitTypes::encodeUnit( mSpreadUnit ) );
128128
props.insert( "spread_unit_scale", QgsSymbolLayerV2Utils::encodeMapUnitScale( mSpreadMapUnitScale ) );
129129
props.insert( "color_type", QString::number( static_cast< int >( mColorType ) ) );
130130
props.insert( "single_color", QgsSymbolLayerV2Utils::encodeColor( mColor ) );
@@ -162,7 +162,7 @@ void QgsGlowEffect::readProperties( const QgsStringMap &props )
162162
{
163163
mSpread = spread;
164164
}
165-
mSpreadUnit = QgsSymbolLayerV2Utils::decodeOutputUnit( props.value( "spread_unit" ) );
165+
mSpreadUnit = QgsUnitTypes::decodeRenderUnit( props.value( "spread_unit" ) );
166166
mSpreadMapUnitScale = QgsSymbolLayerV2Utils::decodeMapUnitScale( props.value( "spread_unit_scale" ) );
167167
QgsGlowEffect::GlowColorType type = static_cast< QgsGlowEffect::GlowColorType >( props.value( "color_type" ).toInt( &ok ) );
168168
if ( ok )

‎src/core/effects/qgsshadoweffect.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ QgsStringMap QgsShadowEffect::properties() const
103103
props.insert( "blur_level", QString::number( mBlurLevel ) );
104104
props.insert( "offset_angle", QString::number( mOffsetAngle ) );
105105
props.insert( "offset_distance", QString::number( mOffsetDist ) );
106-
props.insert( "offset_unit", QgsSymbolLayerV2Utils::encodeOutputUnit( mOffsetUnit ) );
106+
props.insert( "offset_unit", QgsUnitTypes::encodeUnit( mOffsetUnit ) );
107107
props.insert( "offset_unit_scale", QgsSymbolLayerV2Utils::encodeMapUnitScale( mOffsetMapUnitScale ) );
108108
props.insert( "color", QgsSymbolLayerV2Utils::encodeColor( mColor ) );
109109
return props;
@@ -139,7 +139,7 @@ void QgsShadowEffect::readProperties( const QgsStringMap &props )
139139
{
140140
mOffsetDist = distance;
141141
}
142-
mOffsetUnit = QgsSymbolLayerV2Utils::decodeOutputUnit( props.value( "offset_unit" ) );
142+
mOffsetUnit = QgsUnitTypes::decodeRenderUnit( props.value( "offset_unit" ) );
143143
mOffsetMapUnitScale = QgsSymbolLayerV2Utils::decodeMapUnitScale( props.value( "offset_unit_scale" ) );
144144
if ( props.contains( "color" ) )
145145
{

‎src/core/effects/qgstransformeffect.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ QgsStringMap QgsTransformEffect::properties() const
7878
props.insert( "shear_y", QString::number( mShearY ) );
7979
props.insert( "translate_x", QString::number( mTranslateX ) );
8080
props.insert( "translate_y", QString::number( mTranslateY ) );
81-
props.insert( "translate_unit", QgsSymbolLayerV2Utils::encodeOutputUnit( mTranslateUnit ) );
81+
props.insert( "translate_unit", QgsUnitTypes::encodeUnit( mTranslateUnit ) );
8282
props.insert( "translate_unit_scale", QgsSymbolLayerV2Utils::encodeMapUnitScale( mTranslateMapUnitScale ) );
8383
props.insert( "enabled", mEnabled ? "1" : "0" );
8484
props.insert( "draw_mode", QString::number( int( mDrawMode ) ) );
@@ -96,7 +96,7 @@ void QgsTransformEffect::readProperties( const QgsStringMap &props )
9696
mRotation = props.value( "rotation", "0.0" ).toDouble();
9797
mTranslateX = props.value( "translate_x", "0.0" ).toDouble();
9898
mTranslateY = props.value( "translate_y", "0.0" ).toDouble();
99-
mTranslateUnit = QgsSymbolLayerV2Utils::decodeOutputUnit( props.value( "translate_unit" ) );
99+
mTranslateUnit = QgsUnitTypes::decodeRenderUnit( props.value( "translate_unit" ) );
100100
mTranslateMapUnitScale = QgsSymbolLayerV2Utils::decodeMapUnitScale( props.value( "translate_unit_scale" ) );
101101
}
102102

‎src/core/qgsdiagramrendererv2.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,12 +197,12 @@ void QgsDiagramSettings::readXml( const QDomElement& elem, const QgsVectorLayer*
197197
}
198198
else
199199
{
200-
sizeType = QgsSymbolLayerV2Utils::decodeOutputUnit( elem.attribute( "sizeType" ) );
200+
sizeType = QgsUnitTypes::decodeRenderUnit( elem.attribute( "sizeType" ) );
201201
}
202202
sizeScale = QgsSymbolLayerV2Utils::decodeMapUnitScale( elem.attribute( "sizeScale" ) );
203203

204204
//line width unit type and scale
205-
lineSizeUnit = QgsSymbolLayerV2Utils::decodeOutputUnit( elem.attribute( "lineSizeType" ) );
205+
lineSizeUnit = QgsUnitTypes::decodeRenderUnit( elem.attribute( "lineSizeType" ) );
206206
lineSizeScale = QgsSymbolLayerV2Utils::decodeMapUnitScale( elem.attribute( "lineSizeScale" ) );
207207

208208
//label placement method
@@ -314,11 +314,11 @@ void QgsDiagramSettings::writeXml( QDomElement& rendererElem, QDomDocument& doc,
314314
categoryElem.setAttribute( "transparency", QString::number( transparency ) );
315315

316316
//diagram size unit type and scale
317-
categoryElem.setAttribute( "sizeType", QgsSymbolLayerV2Utils::encodeOutputUnit( sizeType ) );
317+
categoryElem.setAttribute( "sizeType", QgsUnitTypes::encodeUnit( sizeType ) );
318318
categoryElem.setAttribute( "sizeScale", QgsSymbolLayerV2Utils::encodeMapUnitScale( sizeScale ) );
319319

320320
//line width unit type and scale
321-
categoryElem.setAttribute( "lineSizeType", QgsSymbolLayerV2Utils::encodeOutputUnit( lineSizeUnit ) );
321+
categoryElem.setAttribute( "lineSizeType", QgsUnitTypes::encodeUnit( lineSizeUnit ) );
322322
categoryElem.setAttribute( "lineSizeScale", QgsSymbolLayerV2Utils::encodeMapUnitScale( lineSizeScale ) );
323323

324324
// label placement method (text diagram)

‎src/core/qgspallabeling.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4811,7 +4811,7 @@ void QgsPalLabeling::drawLabelBackground( QgsRenderContext& context,
48114811
QgsStringMap map; // for SVG symbology marker
48124812
map["name"] = QgsSymbolLayerV2Utils::symbolNameToPath( tmpLyr.shapeSVGFile.trimmed() );
48134813
map["size"] = QString::number( sizeOut );
4814-
map["size_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit(
4814+
map["size_unit"] = QgsUnitTypes::encodeUnit(
48154815
tmpLyr.shapeSizeUnits == QgsPalLayerSettings::MapUnits ? QgsUnitTypes::RenderMapUnits : QgsUnitTypes::RenderMillimeters );
48164816
map["angle"] = QString::number( 0.0 ); // angle is handled by this local painter
48174817

‎src/core/symbology-ng/qgsarrowsymbollayer.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ QgsSymbolLayerV2* QgsArrowSymbolLayer::create( const QgsStringMap& props )
6363
l->setArrowWidth( props["arrow_width"].toDouble() );
6464

6565
if ( props.contains( "arrow_width_unit" ) )
66-
l->setArrowWidthUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["arrow_width_unit"] ) );
66+
l->setArrowWidthUnit( QgsUnitTypes::decodeRenderUnit( props["arrow_width_unit"] ) );
6767

6868
if ( props.contains( "arrow_width_unit_scale" ) )
6969
l->setArrowWidthUnitScale( QgsSymbolLayerV2Utils::decodeMapUnitScale( props["arrow_width_unit_scale"] ) );
@@ -72,7 +72,7 @@ QgsSymbolLayerV2* QgsArrowSymbolLayer::create( const QgsStringMap& props )
7272
l->setArrowStartWidth( props["arrow_start_width"].toDouble() );
7373

7474
if ( props.contains( "arrow_start_width_unit" ) )
75-
l->setArrowStartWidthUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["arrow_start_width_unit"] ) );
75+
l->setArrowStartWidthUnit( QgsUnitTypes::decodeRenderUnit( props["arrow_start_width_unit"] ) );
7676

7777
if ( props.contains( "arrow_start_width_unit_scale" ) )
7878
l->setArrowStartWidthUnitScale( QgsSymbolLayerV2Utils::decodeMapUnitScale( props["arrow_start_width_unit_scale"] ) );
@@ -87,7 +87,7 @@ QgsSymbolLayerV2* QgsArrowSymbolLayer::create( const QgsStringMap& props )
8787
l->setHeadLength( props["head_length"].toDouble() );
8888

8989
if ( props.contains( "head_length_unit" ) )
90-
l->setHeadLengthUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["head_length_unit"] ) );
90+
l->setHeadLengthUnit( QgsUnitTypes::decodeRenderUnit( props["head_length_unit"] ) );
9191

9292
if ( props.contains( "head_length_unit_scale" ) )
9393
l->setHeadLengthUnitScale( QgsSymbolLayerV2Utils::decodeMapUnitScale( props["head_length_unit_scale"] ) );
@@ -96,7 +96,7 @@ QgsSymbolLayerV2* QgsArrowSymbolLayer::create( const QgsStringMap& props )
9696
l->setHeadThickness( props["head_thickness"].toDouble() );
9797

9898
if ( props.contains( "head_thickness_unit" ) )
99-
l->setHeadThicknessUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["head_thickness_unit"] ) );
99+
l->setHeadThicknessUnit( QgsUnitTypes::decodeRenderUnit( props["head_thickness_unit"] ) );
100100

101101
if ( props.contains( "head_thickness_unit_scale" ) )
102102
l->setHeadThicknessUnitScale( QgsSymbolLayerV2Utils::decodeMapUnitScale( props["head_thickness_unit_scale"] ) );
@@ -111,7 +111,7 @@ QgsSymbolLayerV2* QgsArrowSymbolLayer::create( const QgsStringMap& props )
111111
l->setOffset( props["offset"].toDouble() );
112112

113113
if ( props.contains( "offset_unit" ) )
114-
l->setOffsetUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( props["offset_unit"] ) );
114+
l->setOffsetUnit( QgsUnitTypes::decodeRenderUnit( props["offset_unit"] ) );
115115

116116
if ( props.contains( "offset_unit_scale" ) )
117117
l->setOffsetMapUnitScale( QgsSymbolLayerV2Utils::decodeMapUnitScale( props["offset_unit_scale"] ) );
@@ -142,29 +142,29 @@ QgsStringMap QgsArrowSymbolLayer::properties() const
142142
QgsStringMap map;
143143

144144
map["arrow_width"] = QString::number( arrowWidth() );
145-
map["arrow_width_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( arrowWidthUnit() );
145+
map["arrow_width_unit"] = QgsUnitTypes::encodeUnit( arrowWidthUnit() );
146146
map["arrow_width_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( arrowWidthUnitScale() );
147147

148148
map["arrow_start_width"] = QString::number( arrowStartWidth() );
149-
map["arrow_start_width_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( arrowStartWidthUnit() );
149+
map["arrow_start_width_unit"] = QgsUnitTypes::encodeUnit( arrowStartWidthUnit() );
150150
map["arrow_start_width_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( arrowStartWidthUnitScale() );
151151

152152
map["is_curved"] = QString::number( isCurved() ? 1 : 0 );
153153
map["is_repeated"] = QString::number( isRepeated() ? 1 : 0 );
154154

155155
map["head_length"] = QString::number( headLength() );
156-
map["head_length_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( headLengthUnit() );
156+
map["head_length_unit"] = QgsUnitTypes::encodeUnit( headLengthUnit() );
157157
map["head_length_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( headLengthUnitScale() );
158158

159159
map["head_thickness"] = QString::number( headThickness() );
160-
map["head_thickness_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( headThicknessUnit() );
160+
map["head_thickness_unit"] = QgsUnitTypes::encodeUnit( headThicknessUnit() );
161161
map["head_thickness_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( headThicknessUnitScale() );
162162

163163
map["head_type"] = QString::number( headType() );
164164
map["arrow_type"] = QString::number( arrowType() );
165165

166166
map["offset"] = QString::number( offset() );
167-
map["offset_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( offsetUnit() );
167+
map["offset_unit"] = QgsUnitTypes::encodeUnit( offsetUnit() );
168168
map["offset_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( offsetMapUnitScale() );
169169

170170
saveDataDefinedProperties( map );

‎src/core/symbology-ng/qgsellipsesymbollayerv2.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ QgsSymbolLayerV2* QgsEllipseSymbolLayerV2::create( const QgsStringMap& propertie
6868
}
6969
if ( properties.contains( "symbol_width_unit" ) )
7070
{
71-
layer->setSymbolWidthUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( properties["symbol_width_unit"] ) );
71+
layer->setSymbolWidthUnit( QgsUnitTypes::decodeRenderUnit( properties["symbol_width_unit"] ) );
7272
}
7373
if ( properties.contains( "symbol_width_map_unit_scale" ) )
7474
{
@@ -80,7 +80,7 @@ QgsSymbolLayerV2* QgsEllipseSymbolLayerV2::create( const QgsStringMap& propertie
8080
}
8181
if ( properties.contains( "symbol_height_unit" ) )
8282
{
83-
layer->setSymbolHeightUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( properties["symbol_height_unit"] ) );
83+
layer->setSymbolHeightUnit( QgsUnitTypes::decodeRenderUnit( properties["symbol_height_unit"] ) );
8484
}
8585
if ( properties.contains( "symbol_height_map_unit_scale" ) )
8686
{
@@ -112,11 +112,11 @@ QgsSymbolLayerV2* QgsEllipseSymbolLayerV2::create( const QgsStringMap& propertie
112112
}
113113
if ( properties.contains( "outline_width_unit" ) )
114114
{
115-
layer->setOutlineWidthUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( properties["outline_width_unit"] ) );
115+
layer->setOutlineWidthUnit( QgsUnitTypes::decodeRenderUnit( properties["outline_width_unit"] ) );
116116
}
117117
else if ( properties.contains( "line_width_unit" ) )
118118
{
119-
layer->setOutlineWidthUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( properties["line_width_unit"] ) );
119+
layer->setOutlineWidthUnit( QgsUnitTypes::decodeRenderUnit( properties["line_width_unit"] ) );
120120
}
121121
if ( properties.contains( "outline_width_map_unit_scale" ) )
122122
{
@@ -145,7 +145,7 @@ QgsSymbolLayerV2* QgsEllipseSymbolLayerV2::create( const QgsStringMap& propertie
145145
}
146146
if ( properties.contains( "size_unit" ) )
147147
{
148-
layer->setSizeUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( properties["size_unit"] ) );
148+
layer->setSizeUnit( QgsUnitTypes::decodeRenderUnit( properties["size_unit"] ) );
149149
}
150150
if ( properties.contains( "size_map_unit_scale" ) )
151151
{
@@ -157,7 +157,7 @@ QgsSymbolLayerV2* QgsEllipseSymbolLayerV2::create( const QgsStringMap& propertie
157157
}
158158
if ( properties.contains( "offset_unit" ) )
159159
{
160-
layer->setOffsetUnit( QgsSymbolLayerV2Utils::decodeOutputUnit( properties["offset_unit"] ) );
160+
layer->setOffsetUnit( QgsUnitTypes::decodeRenderUnit( properties["offset_unit"] ) );
161161
}
162162
if ( properties.contains( "offset_map_unit_scale" ) )
163163
{
@@ -510,24 +510,24 @@ QgsStringMap QgsEllipseSymbolLayerV2::properties() const
510510
QgsStringMap map;
511511
map["symbol_name"] = mSymbolName;
512512
map["symbol_width"] = QString::number( mSymbolWidth );
513-
map["symbol_width_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mSymbolWidthUnit );
513+
map["symbol_width_unit"] = QgsUnitTypes::encodeUnit( mSymbolWidthUnit );
514514
map["symbol_width_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mSymbolWidthMapUnitScale );
515515
map["symbol_height"] = QString::number( mSymbolHeight );
516-
map["symbol_height_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mSymbolHeightUnit );
516+
map["symbol_height_unit"] = QgsUnitTypes::encodeUnit( mSymbolHeightUnit );
517517
map["symbol_height_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mSymbolHeightMapUnitScale );
518518
map["angle"] = QString::number( mAngle );
519519
map["outline_style"] = QgsSymbolLayerV2Utils::encodePenStyle( mOutlineStyle );
520520
map["outline_width"] = QString::number( mOutlineWidth );
521-
map["outline_width_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mOutlineWidthUnit );
521+
map["outline_width_unit"] = QgsUnitTypes::encodeUnit( mOutlineWidthUnit );
522522
map["outline_width_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mOutlineWidthMapUnitScale );
523523
map["joinstyle"] = QgsSymbolLayerV2Utils::encodePenJoinStyle( mPenJoinStyle );
524524
map["color"] = QgsSymbolLayerV2Utils::encodeColor( mColor );
525525
map["outline_color"] = QgsSymbolLayerV2Utils::encodeColor( mOutlineColor );
526526
map["offset"] = QgsSymbolLayerV2Utils::encodePoint( mOffset );
527-
map["offset_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mOffsetUnit );
527+
map["offset_unit"] = QgsUnitTypes::encodeUnit( mOffsetUnit );
528528
map["offset_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mOffsetMapUnitScale );
529529
map["size"] = QString::number( mSize );
530-
map["size_unit"] = QgsSymbolLayerV2Utils::encodeOutputUnit( mSizeUnit );
530+
map["size_unit"] = QgsUnitTypes::encodeUnit( mSizeUnit );
531531
map["size_map_unit_scale"] = QgsSymbolLayerV2Utils::encodeMapUnitScale( mSizeMapUnitScale );
532532
map["horizontal_anchor_point"] = QString::number( mHorizontalAnchorPoint );
533533
map["vertical_anchor_point"] = QString::number( mVerticalAnchorPoint );

0 commit comments

Comments
 (0)