Skip to content

Commit be5d297

Browse files
committed
Fix some Clazy detaching container warnings
(not all are valid, but at worst this flips some more Q_FOREACH uses to c++11 for loops)
1 parent 82a772f commit be5d297

28 files changed

+58
-42
lines changed

src/app/dwg/qgsdwgimportdialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ void QgsDwgImportDialog::on_buttonBox_accepted()
471471
QgsLayerTreeGroup *dwgGroup = QgisApp::instance()->layerTreeView()->layerTreeModel()->rootGroup()->addGroup( leLayerGroup->text() );
472472
Q_ASSERT( dwgGroup );
473473

474-
Q_FOREACH ( QString layer, layers.keys() )
474+
Q_FOREACH ( const QString &layer, layers.keys() )
475475
{
476476
createGroup( dwgGroup, layer, QStringList( layer ), layers[layer] );
477477
}

src/app/dwg/qgsdwgimporter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2606,7 +2606,7 @@ bool QgsDwgImporter::expandInserts( QString &error )
26062606
QTransform t;
26072607
t.translate( p.x(), p.y() ).scale( xscale, yscale ).rotateRadians( angle );
26082608

2609-
Q_FOREACH ( QString name, QStringList() << "hatches" << "lines" << "polylines" << "texts" << "points" )
2609+
Q_FOREACH ( const QString &name, QStringList() << "hatches" << "lines" << "polylines" << "texts" << "points" )
26102610
{
26112611
OGRLayerH src = OGR_DS_ExecuteSQL( mDs, QString( "SELECT * FROM %1 WHERE block=%2" ).arg( name ).arg( handle ).toUtf8().constData(), nullptr, nullptr );
26122612
if ( !src )

src/app/qgscrashreport.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ const QString QgsCrashReport::toHtml() const
108108
}
109109

110110
QString report;
111-
Q_FOREACH ( QString line, reportData )
111+
Q_FOREACH ( const QString &line, reportData )
112112
{
113113
report += line + "<br>";
114114
}

src/app/qgsjoindialog.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,8 @@ void QgsJoinDialog::joinedLayerChanged( QgsMapLayer *layer )
171171

172172
mUseJoinFieldsSubset->setChecked( false );
173173
QStandardItemModel *subsetModel = new QStandardItemModel( this );
174-
Q_FOREACH ( const QgsField &field, vLayer->fields() )
174+
const QgsFields layerFields = vLayer->fields();
175+
for ( const QgsField &field : layerFields )
175176
{
176177
QStandardItem *subsetItem = new QStandardItem( field.name() );
177178
subsetItem->setCheckable( true );

src/app/qgsmaplayerstyleguiutils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ QList<QAction *> QgsMapLayerStyleGuiUtils::actionsUseStyle( QgsMapLayer *layer,
6262
bool onlyOneStyle = mgr->styles().count() == 1;
6363

6464
QList<QAction *> actions;
65-
Q_FOREACH ( QString name, mgr->styles() )
65+
Q_FOREACH ( const QString &name, mgr->styles() )
6666
{
6767
bool active = name == mgr->currentStyle();
6868
QAction *actionUse = new QAction( name, parent );

src/core/composer/qgscomposerattributetablev2.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,8 @@ void QgsComposerAttributeTableV2::resetColumns()
201201

202202
//rebuild columns list from vector layer fields
203203
int idx = 0;
204-
Q_FOREACH ( const QgsField &field, source->fields() )
204+
const QgsFields sourceFields = source->fields();
205+
for ( const auto &field : sourceFields )
205206
{
206207
QString currentAlias = source->attributeDisplayName( idx );
207208
QgsComposerTableColumn *col = new QgsComposerTableColumn;
@@ -319,7 +320,7 @@ void QgsComposerAttributeTableV2::setDisplayedFields( const QStringList &fields,
319320
qDeleteAll( mColumns );
320321
mColumns.clear();
321322

322-
QgsFields layerFields = source->fields();
323+
const QgsFields layerFields = source->fields();
323324

324325
if ( !fields.isEmpty() )
325326
{
@@ -340,7 +341,7 @@ void QgsComposerAttributeTableV2::setDisplayedFields( const QStringList &fields,
340341
{
341342
//resetting, so add all attributes to columns
342343
int idx = 0;
343-
Q_FOREACH ( const QgsField &field, layerFields )
344+
for ( const QgsField &field : layerFields )
344345
{
345346
QString currentAlias = source->attributeDisplayName( idx );
346347
QgsComposerTableColumn *col = new QgsComposerTableColumn;

src/core/providers/memory/qgsmemoryproviderutils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ QgsVectorLayer *QgsMemoryProviderUtils::createMemoryLayer( const QString &name,
6161
{
6262
parts << QStringLiteral( "crs=" ) + crs.authid();
6363
}
64-
Q_FOREACH ( const QgsField &field, fields )
64+
for ( const auto &field : fields )
6565
{
6666
parts << QStringLiteral( "field=%1:%2" ).arg( field.name(), memoryLayerFieldType( field.type() ) );
6767
}

src/core/qgsattributetableconfig.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ void QgsAttributeTableConfig::update( const QgsFields &fields )
8080
}
8181
}
8282

83-
Q_FOREACH ( const QgsField &field, fields )
83+
for ( const auto &field : fields )
8484
{
8585
if ( !columns.contains( field.name() ) )
8686
{

src/core/qgsdataitem.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1135,10 +1135,8 @@ void QgsZipItem::init()
11351135
// keys << "ogr" << "gdal";
11361136
keys << QStringLiteral( "gdal" ) << QStringLiteral( "ogr" );
11371137

1138-
QStringList::const_iterator i;
1139-
for ( i = keys.begin(); i != keys.end(); ++i )
1138+
for ( const auto &k : qgsAsConst( keys ) )
11401139
{
1141-
QString k( *i );
11421140
QgsDebugMsgLevel( "provider " + k, 3 );
11431141
// some providers hangs with empty uri (PostGIS) etc...
11441142
// -> using libraries directly

src/core/qgsgml.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ void QgsGmlStreamingParser::startElement( const XML_Char *el, const XML_Char **a
603603
{
604604
QString currentTypename( QString::fromUtf8( pszLocalName, localNameLen ) );
605605
QMap< QString, LayerProperties >::const_iterator iter = mMapTypeNameToProperties.constFind( currentTypename );
606-
if ( iter != mMapTypeNameToProperties.end() )
606+
if ( iter != mMapTypeNameToProperties.constEnd() )
607607
{
608608
mFeatureTupleDepth = mParseDepth;
609609
mCurrentTypename = currentTypename;

0 commit comments

Comments
 (0)