Skip to content

Commit e4f17f4

Browse files
nyalldawsonnyalldawson
committed
Add missing QStringLiterals
1 parent a7470b3 commit e4f17f4

11 files changed

+47
-39
lines changed

‎src/core/composer/qgsatlascomposition.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ QString QgsAtlasComposition::currentFilename() const
602602
void QgsAtlasComposition::writeXml( QDomElement &elem, QDomDocument &doc ) const
603603
{
604604
QDomElement atlasElem = doc.createElement( QStringLiteral( "Atlas" ) );
605-
atlasElem.setAttribute( QStringLiteral( "enabled" ), mEnabled ? "true" : "false" );
605+
atlasElem.setAttribute( QStringLiteral( "enabled" ), mEnabled ? QStringLiteral( "true" ) : QStringLiteral( "false" ) );
606606
if ( !mEnabled )
607607
{
608608
return;
@@ -620,18 +620,18 @@ void QgsAtlasComposition::writeXml( QDomElement &elem, QDomDocument &doc ) const
620620
atlasElem.setAttribute( QStringLiteral( "coverageLayer" ), QLatin1String( "" ) );
621621
}
622622

623-
atlasElem.setAttribute( QStringLiteral( "hideCoverage" ), mHideCoverage ? "true" : "false" );
624-
atlasElem.setAttribute( QStringLiteral( "singleFile" ), mSingleFile ? "true" : "false" );
623+
atlasElem.setAttribute( QStringLiteral( "hideCoverage" ), mHideCoverage ? QStringLiteral( "true" ) : QStringLiteral( "false" ) );
624+
atlasElem.setAttribute( QStringLiteral( "singleFile" ), mSingleFile ? QStringLiteral( "true" ) : QStringLiteral( "false" ) );
625625
atlasElem.setAttribute( QStringLiteral( "filenamePattern" ), mFilenamePattern );
626626
atlasElem.setAttribute( QStringLiteral( "pageNameExpression" ), mPageNameExpression );
627627

628-
atlasElem.setAttribute( QStringLiteral( "sortFeatures" ), mSortFeatures ? "true" : "false" );
628+
atlasElem.setAttribute( QStringLiteral( "sortFeatures" ), mSortFeatures ? QStringLiteral( "true" ) : QStringLiteral( "false" ) );
629629
if ( mSortFeatures )
630630
{
631631
atlasElem.setAttribute( QStringLiteral( "sortKey" ), mSortKeyAttributeName );
632-
atlasElem.setAttribute( QStringLiteral( "sortAscending" ), mSortAscending ? "true" : "false" );
632+
atlasElem.setAttribute( QStringLiteral( "sortAscending" ), mSortAscending ? QStringLiteral( "true" ) : QStringLiteral( "false" ) );
633633
}
634-
atlasElem.setAttribute( QStringLiteral( "filterFeatures" ), mFilterFeatures ? "true" : "false" );
634+
atlasElem.setAttribute( QStringLiteral( "filterFeatures" ), mFilterFeatures ? QStringLiteral( "true" ) : QStringLiteral( "false" ) );
635635
if ( mFilterFeatures )
636636
{
637637
atlasElem.setAttribute( QStringLiteral( "featureFilter" ), mFeatureFilter );

‎src/core/gps/qgsgpsdetector.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,10 @@ QList< QPair<QString, QString> > QgsGPSDetector::availablePorts()
4444

4545
#ifdef Q_OS_LINUX
4646
// look for linux serial devices
47-
Q_FOREACH ( const QString &linuxDev, QStringList() << "/dev/ttyS%1" << "/dev/ttyUSB%1" << "/dev/rfcomm%1" << "/dev/ttyACM%1" )
47+
const QStringList devices { QStringLiteral( "/dev/ttyS%1" ),
48+
QStringLiteral( "/dev/ttyUSB%1" ),
49+
QStringLiteral( "/dev/rfcomm%1" ), QStringLiteral( "/dev/ttyACM%1" ) };
50+
for ( const QString &linuxDev : devices )
4851
{
4952
for ( int i = 0; i < 10; ++i )
5053
{

‎src/core/symbology/qgscategorizedsymbolrenderer.cpp

+5-4
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@ QgsFeatureRenderer *QgsCategorizedSymbolRenderer::create( QDomElement &element,
644644
}
645645
}
646646

647-
QDomElement ddsLegendSizeElem = element.firstChildElement( "data-defined-size-legend" );
647+
QDomElement ddsLegendSizeElem = element.firstChildElement( QStringLiteral( "data-defined-size-legend" ) );
648648
if ( !ddsLegendSizeElem.isNull() )
649649
{
650650
r->mDataDefinedSizeLegend.reset( QgsDataDefinedSizeLegend::readXml( ddsLegendSizeElem, context ) );
@@ -656,10 +656,11 @@ QgsFeatureRenderer *QgsCategorizedSymbolRenderer::create( QDomElement &element,
656656

657657
QDomElement QgsCategorizedSymbolRenderer::save( QDomDocument &doc, const QgsReadWriteContext &context )
658658
{
659+
// clazy:skip
659660
QDomElement rendererElem = doc.createElement( RENDERER_TAG_NAME );
660661
rendererElem.setAttribute( QStringLiteral( "type" ), QStringLiteral( "categorizedSymbol" ) );
661-
rendererElem.setAttribute( QStringLiteral( "symbollevels" ), ( mUsingSymbolLevels ? "1" : "0" ) );
662-
rendererElem.setAttribute( QStringLiteral( "forceraster" ), ( mForceRaster ? "1" : "0" ) );
662+
rendererElem.setAttribute( QStringLiteral( "symbollevels" ), ( mUsingSymbolLevels ? QStringLiteral( "1" ) : QStringLiteral( "0" ) ) );
663+
rendererElem.setAttribute( QStringLiteral( "forceraster" ), ( mForceRaster ? QStringLiteral( "1" ) : QStringLiteral( "0" ) ) );
663664
rendererElem.setAttribute( QStringLiteral( "attr" ), mAttrName );
664665

665666
// categories
@@ -722,7 +723,7 @@ QDomElement QgsCategorizedSymbolRenderer::save( QDomDocument &doc, const QgsRead
722723
mOrderBy.save( orderBy );
723724
rendererElem.appendChild( orderBy );
724725
}
725-
rendererElem.setAttribute( QStringLiteral( "enableorderby" ), ( mOrderByEnabled ? "1" : "0" ) );
726+
rendererElem.setAttribute( QStringLiteral( "enableorderby" ), ( mOrderByEnabled ? QStringLiteral( "1" ) : QStringLiteral( "0" ) ) );
726727

727728
if ( mDataDefinedSizeLegend )
728729
{

‎src/core/symbology/qgscptcityarchive.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ QgsCptCityArchive::QgsCptCityArchive( const QString &archiveName, const QString
6767
QgsCptCitySelectionItem *selItem = nullptr;
6868
QDir seldir( mBaseDir + '/' + "selections" );
6969
QgsDebugMsg( "populating selection from " + seldir.path() );
70-
Q_FOREACH ( const QString &selfile, seldir.entryList( QStringList( "*.xml" ), QDir::Files ) )
70+
const QStringList fileList = seldir.entryList( QStringList() << QStringLiteral( "*.xml" ), QDir::Files );
71+
for ( const QString &selfile : fileList )
7172
{
7273
QgsDebugMsg( "file= " + seldir.path() + '/' + selfile );
7374
selItem = new QgsCptCitySelectionItem( nullptr, QFileInfo( selfile ).baseName(),
@@ -460,7 +461,8 @@ void QgsCptCityArchive::initArchives( bool loadAll )
460461
if ( loadAll )
461462
{
462463
QDir dir( baseDir );
463-
Q_FOREACH ( const QString &entry, dir.entryList( QStringList( "cpt-city*" ), QDir::Dirs ) )
464+
const QStringList fileList = dir.entryList( QStringList() << QStringLiteral( "cpt-city*" ), QDir::Dirs );
465+
for ( const QString &entry : fileList )
464466
{
465467
if ( QFile::exists( baseDir + '/' + entry + "/VERSION.xml" ) )
466468
archivesMap[ entry ] = baseDir + '/' + entry;

‎src/core/symbology/qgsfillsymbollayer.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ QgsSymbolLayer *QgsSimpleFillSymbolLayer::createFromSld( QDomElement &element )
381381
QPointF offset;
382382
QgsSymbolLayerUtils::displacementFromSldElement( element, offset );
383383

384-
QString uom = element.attribute( QStringLiteral( "uom" ), "" );
384+
QString uom = element.attribute( QStringLiteral( "uom" ), QString() );
385385
offset.setX( QgsSymbolLayerUtils::sizeInPixelsFromSldUom( uom, offset.x() ) );
386386
offset.setY( QgsSymbolLayerUtils::sizeInPixelsFromSldUom( uom, offset.y() ) );
387387
strokeWidth = QgsSymbolLayerUtils::sizeInPixelsFromSldUom( uom, strokeWidth );
@@ -1013,7 +1013,7 @@ QgsSymbolLayer *QgsShapeburstFillSymbolLayer::create( const QgsStringMap &props
10131013

10141014
//attempt to create color ramp from props
10151015
QgsColorRamp *gradientRamp = nullptr;
1016-
if ( props.contains( QStringLiteral( "rampType" ) ) && props["rampType"] == QStringLiteral( "cpt-city" ) )
1016+
if ( props.contains( QStringLiteral( "rampType" ) ) && props[QStringLiteral( "rampType" )] == QStringLiteral( "cpt-city" ) )
10171017
{
10181018
gradientRamp = QgsCptCityColorRamp::create( props );
10191019
}
@@ -2139,7 +2139,7 @@ QgsSymbolLayer *QgsSVGFillSymbolLayer::createFromSld( QDomElement &element )
21392139

21402140
QgsSymbolLayerUtils::lineFromSld( graphicElem, penStyle, strokeColor, strokeWidth );
21412141

2142-
QString uom = element.attribute( QStringLiteral( "uom" ), "" );
2142+
QString uom = element.attribute( QStringLiteral( "uom" ) );
21432143
size = QgsSymbolLayerUtils::sizeInPixelsFromSldUom( uom, size );
21442144
strokeWidth = QgsSymbolLayerUtils::sizeInPixelsFromSldUom( uom, strokeWidth );
21452145

@@ -2964,7 +2964,7 @@ QgsSymbolLayer *QgsLinePatternFillSymbolLayer::createFromSld( QDomElement &eleme
29642964
offset = std::sqrt( std::pow( vectOffset.x(), 2 ) + std::pow( vectOffset.y(), 2 ) );
29652965
}
29662966

2967-
QString uom = element.attribute( QStringLiteral( "uom" ), "" );
2967+
QString uom = element.attribute( QStringLiteral( "uom" ) );
29682968
size = QgsSymbolLayerUtils::sizeInPixelsFromSldUom( uom, size );
29692969
lineWidth = QgsSymbolLayerUtils::sizeInPixelsFromSldUom( uom, lineWidth );
29702970

‎src/core/symbology/qgsgraduatedsymbolrenderer.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ void QgsRendererRange::toSld( QDomDocument &doc, QDomElement &element, QgsString
169169
// create the ogc:Filter for the range
170170
QString filterFunc = QStringLiteral( "\"%1\" %2 %3 AND \"%1\" <= %4" )
171171
.arg( attrName.replace( '\"', QLatin1String( "\"\"" ) ),
172-
firstRange ? ">=" : ">",
172+
firstRange ? QStringLiteral( ">=" ) : QStringLiteral( ">" ),
173173
qgsDoubleToString( mLowerValue ),
174174
qgsDoubleToString( mUpperValue ) );
175175
QgsSymbolLayerUtils::createFunctionElement( doc, ruleElem, filterFunc );
@@ -282,7 +282,7 @@ void QgsRendererRangeLabelFormat::saveToDomElement( QDomElement &element )
282282
{
283283
element.setAttribute( QStringLiteral( "format" ), mFormat );
284284
element.setAttribute( QStringLiteral( "decimalplaces" ), mPrecision );
285-
element.setAttribute( QStringLiteral( "trimtrailingzeroes" ), mTrimTrailingZeroes ? "true" : "false" );
285+
element.setAttribute( QStringLiteral( "trimtrailingzeroes" ), mTrimTrailingZeroes ? QStringLiteral( "true" ) : QStringLiteral( "false" ) );
286286
}
287287

288288
///////////
@@ -1040,7 +1040,7 @@ QgsFeatureRenderer *QgsGraduatedSymbolRenderer::create( QDomElement &element, co
10401040
r->setLabelFormat( labelFormat );
10411041
}
10421042

1043-
QDomElement ddsLegendSizeElem = element.firstChildElement( "data-defined-size-legend" );
1043+
QDomElement ddsLegendSizeElem = element.firstChildElement( QStringLiteral( "data-defined-size-legend" ) );
10441044
if ( !ddsLegendSizeElem.isNull() )
10451045
{
10461046
r->mDataDefinedSizeLegend.reset( QgsDataDefinedSizeLegend::readXml( ddsLegendSizeElem, context ) );
@@ -1054,8 +1054,8 @@ QDomElement QgsGraduatedSymbolRenderer::save( QDomDocument &doc, const QgsReadWr
10541054
{
10551055
QDomElement rendererElem = doc.createElement( RENDERER_TAG_NAME );
10561056
rendererElem.setAttribute( QStringLiteral( "type" ), QStringLiteral( "graduatedSymbol" ) );
1057-
rendererElem.setAttribute( QStringLiteral( "symbollevels" ), ( mUsingSymbolLevels ? "1" : "0" ) );
1058-
rendererElem.setAttribute( QStringLiteral( "forceraster" ), ( mForceRaster ? "1" : "0" ) );
1057+
rendererElem.setAttribute( QStringLiteral( "symbollevels" ), ( mUsingSymbolLevels ? QStringLiteral( "1" ) : QStringLiteral( "0" ) ) );
1058+
rendererElem.setAttribute( QStringLiteral( "forceraster" ), ( mForceRaster ? QStringLiteral( "1" ) : QStringLiteral( "0" ) ) );
10591059
rendererElem.setAttribute( QStringLiteral( "attr" ), mAttrName );
10601060
rendererElem.setAttribute( QStringLiteral( "graduatedMethod" ), graduatedMethodStr( mGraduatedMethod ) );
10611061

@@ -1075,7 +1075,7 @@ QDomElement QgsGraduatedSymbolRenderer::save( QDomDocument &doc, const QgsReadWr
10751075
rangeElem.setAttribute( QStringLiteral( "upper" ), QString::number( range.upperValue(), 'f', 15 ) );
10761076
rangeElem.setAttribute( QStringLiteral( "symbol" ), symbolName );
10771077
rangeElem.setAttribute( QStringLiteral( "label" ), range.label() );
1078-
rangeElem.setAttribute( QStringLiteral( "render" ), range.renderState() ? "true" : "false" );
1078+
rangeElem.setAttribute( QStringLiteral( "render" ), range.renderState() ? QStringLiteral( "true" ) : QStringLiteral( "false" ) );
10791079
rangesElem.appendChild( rangeElem );
10801080
i++;
10811081
}
@@ -1140,7 +1140,7 @@ QDomElement QgsGraduatedSymbolRenderer::save( QDomDocument &doc, const QgsReadWr
11401140
mOrderBy.save( orderBy );
11411141
rendererElem.appendChild( orderBy );
11421142
}
1143-
rendererElem.setAttribute( QStringLiteral( "enableorderby" ), ( mOrderByEnabled ? "1" : "0" ) );
1143+
rendererElem.setAttribute( QStringLiteral( "enableorderby" ), ( mOrderByEnabled ? QStringLiteral( "1" ) : QStringLiteral( "0" ) ) );
11441144

11451145
if ( mDataDefinedSizeLegend )
11461146
{

‎src/core/symbology/qgsheatmaprenderer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ QDomElement QgsHeatmapRenderer::save( QDomDocument &doc, const QgsReadWriteConte
340340
QDomElement colorRampElem = QgsSymbolLayerUtils::saveColorRamp( QStringLiteral( "[source]" ), mGradientRamp, doc );
341341
rendererElem.appendChild( colorRampElem );
342342
}
343-
rendererElem.setAttribute( QStringLiteral( "forceraster" ), ( mForceRaster ? "1" : "0" ) );
343+
rendererElem.setAttribute( QStringLiteral( "forceraster" ), ( mForceRaster ? QStringLiteral( "1" ) : QStringLiteral( "0" ) ) );
344344

345345
if ( mPaintEffect && !QgsPaintEffectRegistry::isDefaultStack( mPaintEffect ) )
346346
mPaintEffect->saveProperties( doc, rendererElem );

‎src/core/symbology/qgsinvertedpolygonrenderer.cpp

+5-3
Original file line numberDiff line numberDiff line change
@@ -387,10 +387,12 @@ QgsFeatureRenderer *QgsInvertedPolygonRenderer::create( QDomElement &element, co
387387

388388
QDomElement QgsInvertedPolygonRenderer::save( QDomDocument &doc, const QgsReadWriteContext &context )
389389
{
390+
// clazy:skip
391+
390392
QDomElement rendererElem = doc.createElement( RENDERER_TAG_NAME );
391393
rendererElem.setAttribute( QStringLiteral( "type" ), QStringLiteral( "invertedPolygonRenderer" ) );
392-
rendererElem.setAttribute( QStringLiteral( "preprocessing" ), preprocessingEnabled() ? "1" : "0" );
393-
rendererElem.setAttribute( QStringLiteral( "forceraster" ), ( mForceRaster ? "1" : "0" ) );
394+
rendererElem.setAttribute( QStringLiteral( "preprocessing" ), preprocessingEnabled() ? QStringLiteral( "1" ) : QStringLiteral( "0" ) );
395+
rendererElem.setAttribute( QStringLiteral( "forceraster" ), ( mForceRaster ? QStringLiteral( "1" ) : QStringLiteral( "0" ) ) );
394396

395397
if ( mSubRenderer )
396398
{
@@ -407,7 +409,7 @@ QDomElement QgsInvertedPolygonRenderer::save( QDomDocument &doc, const QgsReadWr
407409
mOrderBy.save( orderBy );
408410
rendererElem.appendChild( orderBy );
409411
}
410-
rendererElem.setAttribute( QStringLiteral( "enableorderby" ), ( mOrderByEnabled ? "1" : "0" ) );
412+
rendererElem.setAttribute( QStringLiteral( "enableorderby" ), ( mOrderByEnabled ? QStringLiteral( "1" ) : QStringLiteral( "0" ) ) );
411413

412414
return rendererElem;
413415
}

‎src/core/symbology/qgslinesymbollayer.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -355,11 +355,11 @@ QgsStringMap QgsSimpleLineSymbolLayer::properties() const
355355
map[QStringLiteral( "offset" )] = QString::number( mOffset );
356356
map[QStringLiteral( "offset_unit" )] = QgsUnitTypes::encodeUnit( mOffsetUnit );
357357
map[QStringLiteral( "offset_map_unit_scale" )] = QgsSymbolLayerUtils::encodeMapUnitScale( mOffsetMapUnitScale );
358-
map[QStringLiteral( "use_custom_dash" )] = ( mUseCustomDashPattern ? "1" : "0" );
358+
map[QStringLiteral( "use_custom_dash" )] = ( mUseCustomDashPattern ? QStringLiteral( "1" ) : QStringLiteral( "0" ) );
359359
map[QStringLiteral( "customdash" )] = QgsSymbolLayerUtils::encodeRealVector( mCustomDashVector );
360360
map[QStringLiteral( "customdash_unit" )] = QgsUnitTypes::encodeUnit( mCustomDashPatternUnit );
361361
map[QStringLiteral( "customdash_map_unit_scale" )] = QgsSymbolLayerUtils::encodeMapUnitScale( mCustomDashPatternMapUnitScale );
362-
map[QStringLiteral( "draw_inside_polygon" )] = ( mDrawInsidePolygon ? "1" : "0" );
362+
map[QStringLiteral( "draw_inside_polygon" )] = ( mDrawInsidePolygon ? QStringLiteral( "1" ) : QStringLiteral( "0" ) );
363363
return map;
364364
}
365365

@@ -462,7 +462,7 @@ QgsSymbolLayer *QgsSimpleLineSymbolLayer::createFromSld( QDomElement &element )
462462
offset = d;
463463
}
464464

465-
QString uom = element.attribute( QStringLiteral( "uom" ), "" );
465+
QString uom = element.attribute( QStringLiteral( "uom" ) );
466466
width = QgsSymbolLayerUtils::sizeInPixelsFromSldUom( uom, width );
467467
offset = QgsSymbolLayerUtils::sizeInPixelsFromSldUom( uom, offset );
468468

@@ -747,7 +747,7 @@ QgsSymbolLayer *QgsMarkerLineSymbolLayer::create( const QgsStringMap &props )
747747
{
748748
x->setOffsetAlongLineUnit( QgsUnitTypes::decodeRenderUnit( props[QStringLiteral( "offset_along_line_unit" )] ) );
749749
}
750-
if ( props.contains( ( "offset_along_line_map_unit_scale" ) ) )
750+
if ( props.contains( ( QStringLiteral( "offset_along_line_map_unit_scale" ) ) ) )
751751
{
752752
x->setOffsetAlongLineMapUnitScale( QgsSymbolLayerUtils::decodeMapUnitScale( props[QStringLiteral( "offset_along_line_map_unit_scale" )] ) );
753753
}
@@ -1320,7 +1320,7 @@ void QgsMarkerLineSymbolLayer::renderPolylineCentral( const QPolygonF &points, Q
13201320
QgsStringMap QgsMarkerLineSymbolLayer::properties() const
13211321
{
13221322
QgsStringMap map;
1323-
map[QStringLiteral( "rotate" )] = ( mRotateMarker ? "1" : "0" );
1323+
map[QStringLiteral( "rotate" )] = ( mRotateMarker ? QStringLiteral( "1" ) : QStringLiteral( "0" ) );
13241324
map[QStringLiteral( "interval" )] = QString::number( mInterval );
13251325
map[QStringLiteral( "offset" )] = QString::number( mOffset );
13261326
map[QStringLiteral( "offset_along_line" )] = QString::number( mOffsetAlongLine );
@@ -1523,7 +1523,7 @@ QgsSymbolLayer *QgsMarkerLineSymbolLayer::createFromSld( QDomElement &element )
15231523
offset = d;
15241524
}
15251525

1526-
QString uom = element.attribute( QStringLiteral( "uom" ), "" );
1526+
QString uom = element.attribute( QStringLiteral( "uom" ) );
15271527
interval = QgsSymbolLayerUtils::sizeInPixelsFromSldUom( uom, interval );
15281528
offset = QgsSymbolLayerUtils::sizeInPixelsFromSldUom( uom, offset );
15291529

‎src/core/symbology/qgsmarkersymbollayer.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1194,7 +1194,7 @@ QgsSymbolLayer *QgsSimpleMarkerSymbolLayer::createFromSld( QDomElement &element
11941194

11951195
Shape shape = decodeShape( name );
11961196

1197-
QString uom = element.attribute( QStringLiteral( "uom" ), "" );
1197+
QString uom = element.attribute( QStringLiteral( "uom" ) );
11981198
size = QgsSymbolLayerUtils::sizeInPixelsFromSldUom( uom, size );
11991199
offset.setX( QgsSymbolLayerUtils::sizeInPixelsFromSldUom( uom, offset.x() ) );
12001200
offset.setY( QgsSymbolLayerUtils::sizeInPixelsFromSldUom( uom, offset.y() ) );
@@ -2223,7 +2223,7 @@ QgsSymbolLayer *QgsSvgMarkerSymbolLayer::createFromSld( QDomElement &element )
22232223
if ( !QgsSymbolLayerUtils::externalGraphicFromSld( graphicElem, path, mimeType, fillColor, size ) )
22242224
return nullptr;
22252225

2226-
QString uom = element.attribute( QStringLiteral( "uom" ), "" );
2226+
QString uom = element.attribute( QStringLiteral( "uom" ) );
22272227
size = QgsSymbolLayerUtils::sizeInPixelsFromSldUom( uom, size );
22282228

22292229
if ( mimeType != QLatin1String( "image/svg+xml" ) )
@@ -2883,7 +2883,7 @@ QgsSymbolLayer *QgsFontMarkerSymbolLayer::createFromSld( QDomElement &element )
28832883
QPointF offset;
28842884
QgsSymbolLayerUtils::displacementFromSldElement( graphicElem, offset );
28852885

2886-
QString uom = element.attribute( QStringLiteral( "uom" ), "" );
2886+
QString uom = element.attribute( QStringLiteral( "uom" ) );
28872887
offset.setX( QgsSymbolLayerUtils::sizeInPixelsFromSldUom( uom, offset.x() ) );
28882888
offset.setY( QgsSymbolLayerUtils::sizeInPixelsFromSldUom( uom, offset.y() ) );
28892889
size = QgsSymbolLayerUtils::sizeInPixelsFromSldUom( uom, size );

‎src/core/symbology/qgspointclusterrenderer.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ QgsMarkerSymbol *QgsPointClusterRenderer::clusterSymbol()
124124
QDomElement QgsPointClusterRenderer::save( QDomDocument &doc, const QgsReadWriteContext &context )
125125
{
126126
QDomElement rendererElement = doc.createElement( RENDERER_TAG_NAME );
127-
rendererElement.setAttribute( QStringLiteral( "forceraster" ), ( mForceRaster ? "1" : "0" ) );
127+
rendererElement.setAttribute( QStringLiteral( "forceraster" ), ( mForceRaster ? QStringLiteral( "1" ) : QStringLiteral( "0" ) ) );
128128
rendererElement.setAttribute( QStringLiteral( "type" ), QStringLiteral( "pointCluster" ) );
129129
rendererElement.setAttribute( QStringLiteral( "tolerance" ), QString::number( mTolerance ) );
130130
rendererElement.setAttribute( QStringLiteral( "toleranceUnit" ), QgsUnitTypes::encodeUnit( mToleranceUnit ) );
@@ -150,7 +150,7 @@ QDomElement QgsPointClusterRenderer::save( QDomDocument &doc, const QgsReadWrite
150150
mOrderBy.save( orderBy );
151151
rendererElement.appendChild( orderBy );
152152
}
153-
rendererElement.setAttribute( QStringLiteral( "enableorderby" ), ( mOrderByEnabled ? "1" : "0" ) );
153+
rendererElement.setAttribute( QStringLiteral( "enableorderby" ), ( mOrderByEnabled ? QStringLiteral( "1" ) : QStringLiteral( "0" ) ) );
154154

155155
return rendererElement;
156156
}

0 commit comments

Comments
 (0)