Skip to content

Commit c2af8ca

Browse files
nyalldawsonnyalldawson
committedApr 3, 2018
Fix some clazy warnings in tests
·
ltr-3_40final-3_2_0
1 parent e2d75d5 commit c2af8ca

File tree

1 file changed

+34
-29
lines changed

1 file changed

+34
-29
lines changed
 

‎tests/src/core/testqgscompositionconverter.cpp

Lines changed: 34 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,9 @@ class TestQgsCompositionConverter: public QObject
150150

151151
private:
152152

153-
void checkRenderedImage( QgsLayout *layout, const QString testName, const int pageNumber = 0 );
153+
void checkRenderedImage( QgsLayout *layout, const QString &testName, const int pageNumber = 0 );
154154

155-
QDomElement loadComposer( const QString name );
155+
QDomElement loadComposer( const QString &name );
156156

157157
QString mReport;
158158

@@ -192,7 +192,7 @@ void TestQgsCompositionConverter::cleanup()
192192

193193
void TestQgsCompositionConverter::importComposerTemplateLabel()
194194
{
195-
QDomElement composerElem( loadComposer( "2x_template_label.qpt" ) );
195+
QDomElement composerElem( loadComposer( QStringLiteral( "2x_template_label.qpt" ) ) );
196196
QgsProject project;
197197
project.read( QStringLiteral( TEST_DATA_DIR ) + "/layouts/sample_project.qgs" );
198198
QDomElement docElem = composerElem.elementsByTagName( QStringLiteral( "Composition" ) ).at( 0 ).toElement();
@@ -225,7 +225,7 @@ void TestQgsCompositionConverter::importComposerTemplateLabel()
225225

226226
void TestQgsCompositionConverter::importComposerTemplateShape()
227227
{
228-
QDomElement composerElem( loadComposer( "2x_template_shape.qpt" ) );
228+
QDomElement composerElem( loadComposer( QStringLiteral( "2x_template_shape.qpt" ) ) );
229229
QgsProject project;
230230
project.read( QStringLiteral( TEST_DATA_DIR ) + "/layouts/sample_project.qgs" );
231231
QDomElement docElem = composerElem.elementsByTagName( QStringLiteral( "Composition" ) ).at( 0 ).toElement();
@@ -261,7 +261,7 @@ void TestQgsCompositionConverter::importComposerTemplateShape()
261261

262262
void TestQgsCompositionConverter::importComposerTemplatePicture()
263263
{
264-
QDomElement composerElem( loadComposer( "2x_template_pictures.qpt" ) );
264+
QDomElement composerElem( loadComposer( QStringLiteral( "2x_template_pictures.qpt" ) ) );
265265
QVERIFY( !composerElem.isNull() );
266266
QgsProject project;
267267
project.read( QStringLiteral( TEST_DATA_DIR ) + "/layouts/sample_project.qgs" );
@@ -293,7 +293,7 @@ void TestQgsCompositionConverter::importComposerTemplatePicture()
293293

294294
void TestQgsCompositionConverter::importComposerTemplatePolygon()
295295
{
296-
QDomElement composerElem( loadComposer( "2x_template_polygon.qpt" ) );
296+
QDomElement composerElem( loadComposer( QStringLiteral( "2x_template_polygon.qpt" ) ) );
297297
QVERIFY( !composerElem.isNull() );
298298
QgsProject project;
299299
project.read( QStringLiteral( TEST_DATA_DIR ) + "/layouts/sample_project.qgs" );
@@ -319,7 +319,7 @@ void TestQgsCompositionConverter::importComposerTemplatePolygon()
319319

320320
void TestQgsCompositionConverter::importComposerTemplatePolyline()
321321
{
322-
QDomElement composerElem( loadComposer( "2x_template_polyline.qpt" ) );
322+
QDomElement composerElem( loadComposer( QStringLiteral( "2x_template_polyline.qpt" ) ) );
323323
QVERIFY( !composerElem.isNull() );
324324
QgsProject project;
325325
project.read( QStringLiteral( TEST_DATA_DIR ) + "/layouts/sample_project.qgs" );
@@ -347,7 +347,7 @@ void TestQgsCompositionConverter::importComposerTemplatePolyline()
347347

348348
void TestQgsCompositionConverter::importComposerTemplateArrow()
349349
{
350-
QDomElement composerElem( loadComposer( "2x_template_arrow.qpt" ) );
350+
QDomElement composerElem( loadComposer( QStringLiteral( "2x_template_arrow.qpt" ) ) );
351351
QVERIFY( !composerElem.isNull() );
352352
QgsProject project;
353353
project.read( QStringLiteral( TEST_DATA_DIR ) + "/layouts/sample_project.qgs" );
@@ -376,7 +376,7 @@ void TestQgsCompositionConverter::importComposerTemplateArrow()
376376

377377
void TestQgsCompositionConverter::importComposerTemplateMap()
378378
{
379-
QDomElement composerElem( loadComposer( "2x_template_map_overview.qpt" ) );
379+
QDomElement composerElem( loadComposer( QStringLiteral( "2x_template_map_overview.qpt" ) ) );
380380
QVERIFY( !composerElem.isNull() );
381381
QgsProject project;
382382
project.read( QStringLiteral( TEST_DATA_DIR ) + "/layouts/sample_project.qgs" );
@@ -410,6 +410,7 @@ void TestQgsCompositionConverter::importComposerTemplateMap()
410410
QStringList mapUuids;
411411
QList<QgsLayoutItemMap *> mapItems;
412412
layout->layoutItems<QgsLayoutItemMap>( mapItems );
413+
mapUuids.reserve( mapItems.count() );
413414
for ( auto const &item : mapItems )
414415
{
415416
mapUuids << item->uuid();
@@ -419,9 +420,10 @@ void TestQgsCompositionConverter::importComposerTemplateMap()
419420
int count = 0;
420421
QList<QgsLayoutItemMap *> items;
421422
layout->layoutItems<QgsLayoutItemMap>( items );
422-
for ( auto const &mapItem : items )
423+
for ( auto const &mapItem : qgis::as_const( items ) )
423424
{
424-
for ( auto const &item : mapItem->overviews()->asList() )
425+
const auto overviewItems = mapItem->overviews()->asList();
426+
for ( auto const &item : overviewItems )
425427
{
426428
if ( ! item->map( )->uuid().isEmpty( ) )
427429
{
@@ -443,7 +445,7 @@ void TestQgsCompositionConverter::importComposerTemplateMap()
443445

444446
void TestQgsCompositionConverter::importComposerTemplateLegend()
445447
{
446-
QDomElement composerElem( loadComposer( "2x_template_legend.qpt" ) );
448+
QDomElement composerElem( loadComposer( QStringLiteral( "2x_template_legend.qpt" ) ) );
447449
QVERIFY( !composerElem.isNull() );
448450
QgsProject project;
449451
project.read( QStringLiteral( TEST_DATA_DIR ) + "/layouts/sample_project.qgs" );
@@ -469,7 +471,7 @@ void TestQgsCompositionConverter::importComposerTemplateLegend()
469471

470472
void TestQgsCompositionConverter::importComposerTemplateAttributeTable()
471473
{
472-
QDomElement composerElem( loadComposer( "2x_template_attributetable.qpt" ) );
474+
QDomElement composerElem( loadComposer( QStringLiteral( "2x_template_attributetable.qpt" ) ) );
473475
QgsProject project;
474476
project.read( QStringLiteral( TEST_DATA_DIR ) + "/layouts/sample_project.qgs" );
475477
QDomElement docElem = composerElem.elementsByTagName( QStringLiteral( "Composition" ) ).at( 0 ).toElement();
@@ -493,7 +495,7 @@ void TestQgsCompositionConverter::importComposerTemplateAttributeTable()
493495

494496
void TestQgsCompositionConverter::importComposerTemplateHtml()
495497
{
496-
QDomElement composerElem( loadComposer( "2x_template_html.qpt" ) );
498+
QDomElement composerElem( loadComposer( QStringLiteral( "2x_template_html.qpt" ) ) );
497499
QgsProject project;
498500
project.read( QStringLiteral( TEST_DATA_DIR ) + "/layouts/sample_project.qgs" );
499501
QDomElement docElem = composerElem.elementsByTagName( QStringLiteral( "Composition" ) ).at( 0 ).toElement();
@@ -517,7 +519,7 @@ void TestQgsCompositionConverter::importComposerTemplateHtml()
517519

518520
void TestQgsCompositionConverter::importComposerTemplateScaleBar()
519521
{
520-
QDomElement composerElem( loadComposer( "2x_template_scalebar.qpt" ) );
522+
QDomElement composerElem( loadComposer( QStringLiteral( "2x_template_scalebar.qpt" ) ) );
521523
QVERIFY( !composerElem.isNull() );
522524
QgsProject project;
523525
project.read( QStringLiteral( TEST_DATA_DIR ) + "/layouts/sample_project.qgs" );
@@ -564,7 +566,7 @@ void TestQgsCompositionConverter::convertComposition()
564566
void TestQgsCompositionConverter::isCompositionTemplate()
565567
{
566568
QString templatePath( QStringLiteral( TEST_DATA_DIR ) + "/layouts/2x_template.qpt" );
567-
QDomDocument doc( "mydocument" );
569+
QDomDocument doc( QStringLiteral( "mydocument" ) );
568570
QFile file( templatePath );
569571
QVERIFY( file.open( QIODevice::ReadOnly ) );
570572
QVERIFY( doc.setContent( &file ) );
@@ -577,7 +579,7 @@ void TestQgsCompositionConverter::isCompositionTemplate()
577579
void TestQgsCompositionConverter::convertCompositionTemplate()
578580
{
579581
QString templatePath( QStringLiteral( TEST_DATA_DIR ) + "/layouts/2x_template.qpt" );
580-
QDomDocument doc( "mydocument" );
582+
QDomDocument doc( QStringLiteral( "mydocument" ) );
581583
QFile file( templatePath );
582584
QVERIFY( file.open( QIODevice::ReadOnly ) );
583585
QVERIFY( doc.setContent( &file ) );
@@ -599,7 +601,7 @@ void TestQgsCompositionConverter::convertCompositionTemplate()
599601

600602
void TestQgsCompositionConverter::importComposerTemplate()
601603
{
602-
QDomElement composerElem( loadComposer( "2x_template.qpt" ) );
604+
QDomElement composerElem( loadComposer( QStringLiteral( "2x_template.qpt" ) ) );
603605
QgsProject project;
604606
project.read( QStringLiteral( TEST_DATA_DIR ) + "/layouts/sample_project.qgs" );
605607
QDomElement docElem = composerElem.elementsByTagName( QStringLiteral( "Composition" ) ).at( 0 ).toElement();
@@ -614,7 +616,8 @@ void TestQgsCompositionConverter::importComposerTemplate()
614616
QStringList mapUuids;
615617
QList<QgsLayoutItemMap *> mapItems;
616618
layout->layoutItems<QgsLayoutItemMap>( mapItems );
617-
for ( auto const &item : mapItems )
619+
mapUuids.reserve( mapItems.count() );
620+
for ( auto const &item : qgis::as_const( mapItems ) )
618621
{
619622
mapUuids << item->uuid();
620623
}
@@ -624,7 +627,7 @@ void TestQgsCompositionConverter::importComposerTemplate()
624627
int count = 0;
625628
QList<QgsLayoutItemPicture *> items;
626629
layout->layoutItems<QgsLayoutItemPicture>( items );
627-
for ( auto const &item : items )
630+
for ( auto const &item : qgis::as_const( items ) )
628631
{
629632
if ( item->linkedMap() )
630633
{
@@ -642,7 +645,7 @@ void TestQgsCompositionConverter::importComposerTemplate()
642645
int count = 0;
643646
QList<QgsLayoutItemLegend *> items;
644647
layout->layoutItems<QgsLayoutItemLegend>( items );
645-
for ( auto const &item : items )
648+
for ( auto const &item : qgis::as_const( items ) )
646649
{
647650
if ( item->linkedMap() )
648651
{
@@ -659,7 +662,7 @@ void TestQgsCompositionConverter::importComposerTemplate()
659662
int count = 0;
660663
QList<QgsLayoutItemScaleBar *> items;
661664
layout->layoutItems<QgsLayoutItemScaleBar>( items );
662-
for ( auto const &item : items )
665+
for ( auto const &item : qgis::as_const( items ) )
663666
{
664667
if ( item->linkedMap( ) )
665668
{
@@ -678,7 +681,7 @@ void TestQgsCompositionConverter::importComposerTemplate()
678681

679682
void TestQgsCompositionConverter::importComposerAtlas()
680683
{
681-
QDomElement composerElem( loadComposer( "2x_template_atlas.qpt" ) );
684+
QDomElement composerElem( loadComposer( QStringLiteral( "2x_template_atlas.qpt" ) ) );
682685
QVERIFY( !composerElem.isNull() );
683686
QVERIFY( !composerElem.attribute( QStringLiteral( "title" ) ).isEmpty() );
684687
QgsProject project;
@@ -696,23 +699,25 @@ void TestQgsCompositionConverter::importComposerAtlas()
696699

697700
}
698701

699-
void TestQgsCompositionConverter::checkRenderedImage( QgsLayout *layout, const QString testName, const int pageNumber )
702+
void TestQgsCompositionConverter::checkRenderedImage( QgsLayout *layout, const QString &testName, const int pageNumber )
700703
{
701-
QgsLayoutChecker checker( testName + "_" + QString::number( pageNumber ), layout );
704+
QgsLayoutChecker checker( testName + '_' + QString::number( pageNumber ), layout );
702705
QSize size( layout->pageCollection()->page( pageNumber )->sizeWithUnits().width() * 3.77, layout->pageCollection()->page( pageNumber )->sizeWithUnits().height() * 3.77 );
703706
checker.setSize( size );
704707
checker.setControlPathPrefix( QStringLiteral( "compositionconverter" ) );
705708
QVERIFY( checker.testLayout( mReport, pageNumber, 0, false ) );
706709
}
707710

708711

709-
QDomElement TestQgsCompositionConverter::loadComposer( const QString name )
712+
QDomElement TestQgsCompositionConverter::loadComposer( const QString &name )
710713
{
711714
QString templatePath( QStringLiteral( TEST_DATA_DIR ) + "/layouts/" + name );
712-
QDomDocument doc( "mydocument" );
715+
QDomDocument doc( QStringLiteral( "mydocument" ) );
713716
QFile file( templatePath );
714-
Q_ASSERT( file.open( QIODevice::ReadOnly ) );
715-
Q_ASSERT( doc.setContent( &file ) );
717+
bool res = file.open( QIODevice::ReadOnly );
718+
Q_ASSERT( res );
719+
res = doc.setContent( &file );
720+
Q_ASSERT( res );
716721
file.close();
717722
QDomNodeList nodes( doc.elementsByTagName( QStringLiteral( "Composer" ) ) );
718723
if ( nodes.length() > 0 )

0 commit comments

Comments
 (0)
Please sign in to comment.