Skip to content

Commit 5ae312c

Browse files
jef-njef-n
committed
add 'foreach' to astyle and re-run indentation
1 parent f8f034c commit 5ae312c

File tree

126 files changed

+849
-840
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+849
-840
lines changed

‎src/app/composer/qgscomposer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ void QgsComposer::setIconSizes( int size )
348348

349349
//Change all current icon sizes.
350350
QList<QToolBar *> toolbars = findChildren<QToolBar *>();
351-
foreach( QToolBar * toolbar, toolbars )
351+
foreach ( QToolBar * toolbar, toolbars )
352352
{
353353
toolbar->setIconSize( QSize( size, size ) );
354354
}

‎src/app/legend/qgslayerorder.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ void QgsLayerOrder::refreshLayerList()
8585
{
8686
clear();
8787

88-
foreach( QgsLegendLayer *layer, mLegend->legendLayers() )
88+
foreach ( QgsLegendLayer *layer, mLegend->legendLayers() )
8989
{
9090
QListWidgetItem *item = new QListWidgetItem( layer->layer()->name() );
9191
item->setData( 1, QString::number( layer->drawingOrder() ) );
@@ -234,7 +234,7 @@ void QgsLayerOrder::mouseReleaseEvent( QMouseEvent * e )
234234

235235
setCursor( QCursor( Qt::ArrowCursor ) );
236236

237-
foreach( QListWidgetItem *item, mItemsBeingMoved )
237+
foreach ( QListWidgetItem *item, mItemsBeingMoved )
238238
{
239239
if ( mInsertRow >= count() )
240240
{

‎src/app/legend/qgslegend.cpp

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ static QString getUniqueGroupName( QString prefix, QStringList groups )
6565
match.replaceInStrings( prefix, QString( "" ) );
6666
// find the maximum
6767
int max = 0;
68-
foreach( QString m, match )
68+
foreach ( QString m, match )
6969
{
7070
if ( m.toInt() > max )
7171
max = m.toInt();
@@ -286,7 +286,7 @@ void QgsLegend::removeGroup( int groupIndex )
286286
void QgsLegend::removeLayers( QStringList theLayers )
287287
{
288288
QgsDebugMsg( "Entering." );
289-
foreach( const QString &myId, theLayers )
289+
foreach ( const QString &myId, theLayers )
290290
{
291291
bool invLayerRemoved = false;
292292

@@ -364,7 +364,7 @@ void QgsLegend::mouseMoveEvent( QMouseEvent * e )
364364
QgsDebugMsg( "layers prior to move: " + mLayersPriorToMove.join( ", " ) );
365365

366366
// record which items were selected and hide them
367-
foreach( QTreeWidgetItem * item, selectedItems() )
367+
foreach ( QTreeWidgetItem * item, selectedItems() )
368368
{
369369
//prevent to drag out content under groups that are embedded from other
370370
//project files.
@@ -377,7 +377,7 @@ void QgsLegend::mouseMoveEvent( QMouseEvent * e )
377377
}
378378

379379
// remove and unhide items, whose parent is already to be moved
380-
foreach( QTreeWidgetItem * item, mItemsBeingMoved )
380+
foreach ( QTreeWidgetItem * item, mItemsBeingMoved )
381381
{
382382
QTreeWidgetItem *parent = item->parent();
383383

@@ -556,7 +556,7 @@ void QgsLegend::mouseReleaseEvent( QMouseEvent * e )
556556
hideLine();
557557

558558
// unhide
559-
foreach( QTreeWidgetItem * item, mItemsBeingMoved )
559+
foreach ( QTreeWidgetItem * item, mItemsBeingMoved )
560560
{
561561
item->setHidden( false );
562562
}
@@ -574,7 +574,7 @@ void QgsLegend::mouseReleaseEvent( QMouseEvent * e )
574574

575575
showItem( "prev sibling", mDropTarget );
576576

577-
foreach( QTreeWidgetItem * item, mItemsBeingMoved )
577+
foreach ( QTreeWidgetItem * item, mItemsBeingMoved )
578578
{
579579
moveItem( item, mDropTarget );
580580
mDropTarget = item;
@@ -601,7 +601,7 @@ void QgsLegend::mouseReleaseEvent( QMouseEvent * e )
601601
{
602602
showItem( "drop after", mDropTarget );
603603

604-
foreach( QTreeWidgetItem * item, mItemsBeingMoved )
604+
foreach ( QTreeWidgetItem * item, mItemsBeingMoved )
605605
{
606606
moveItem( item, mDropTarget );
607607
mDropTarget = item;
@@ -612,7 +612,7 @@ void QgsLegend::mouseReleaseEvent( QMouseEvent * e )
612612
{
613613
showItem( "insert into", mDropTarget );
614614

615-
foreach( QTreeWidgetItem * item, mItemsBeingMoved )
615+
foreach ( QTreeWidgetItem * item, mItemsBeingMoved )
616616
{
617617
insertItem( item, mDropTarget );
618618
}
@@ -968,7 +968,7 @@ void QgsLegend::addLayers( QList<QgsMapLayer *> theLayerList )
968968
!mMapCanvas->mapRenderer()->hasCrsTransformEnabled() )
969969
{
970970
// Verify if all layers have the same CRS
971-
foreach( QgsMapLayer *l, layers() )
971+
foreach ( QgsMapLayer *l, layers() )
972972
{
973973
if ( myPreviousCrs != l->crs() )
974974
{
@@ -1040,7 +1040,7 @@ QList<QgsMapLayer *> QgsLegend::selectedLayers()
10401040
{
10411041
QList<QgsMapLayer *> layers;
10421042

1043-
foreach( QTreeWidgetItem * item, selectedItems() )
1043+
foreach ( QTreeWidgetItem * item, selectedItems() )
10441044
{
10451045
QgsLegendLayer *ll = dynamic_cast<QgsLegendLayer *>( item );
10461046
if ( ll )
@@ -1087,7 +1087,7 @@ QList<QgsLegendLayer *> QgsLegend::legendLayers()
10871087

10881088
QList< QgsLegendLayer * > ls;
10891089

1090-
foreach( int o, items.uniqueKeys() )
1090+
foreach ( int o, items.uniqueKeys() )
10911091
{
10921092
QgsDebugMsgLevel( QString( "o=%1" ).arg( o ), 3 );
10931093
QList< QgsLegendLayer *> values = items.values( o );
@@ -1106,7 +1106,7 @@ QList<QgsMapLayer *> QgsLegend::layers()
11061106
{
11071107
QList<QgsMapLayer *> ls;
11081108

1109-
foreach( QgsLegendLayer *l, legendLayers() )
1109+
foreach ( QgsLegendLayer *l, legendLayers() )
11101110
{
11111111
ls << l->layer();
11121112
}
@@ -1118,7 +1118,7 @@ QList<QgsMapCanvasLayer> QgsLegend::canvasLayers()
11181118
{
11191119
QList<QgsMapCanvasLayer> ls;
11201120

1121-
foreach( QgsLegendLayer *l, legendLayers() )
1121+
foreach ( QgsLegendLayer *l, legendLayers() )
11221122
{
11231123
ls << l->canvasLayer();
11241124
}
@@ -1234,7 +1234,7 @@ void QgsLegend::setGroupCRS( QgsLegendGroup *lg, const QgsCoordinateReferenceSys
12341234
return;
12351235
}
12361236

1237-
foreach( QgsLegendLayer *cl, lg->legendLayers() )
1237+
foreach ( QgsLegendLayer *cl, lg->legendLayers() )
12381238
{
12391239
if ( cl )
12401240
{
@@ -1310,7 +1310,7 @@ bool QgsLegend::writeXML( QDomNode &legendnode, QDomDocument &document )
13101310

13111311
bool QgsLegend::writeXML( QList<QTreeWidgetItem *> items, QDomNode &node, QDomDocument &document )
13121312
{
1313-
foreach( QTreeWidgetItem * currentItem, items )
1313+
foreach ( QTreeWidgetItem * currentItem, items )
13141314
{
13151315
QgsLegendItem *item = dynamic_cast<QgsLegendItem *>( currentItem );
13161316
if ( !item )
@@ -2002,7 +2002,7 @@ QStringList QgsLegend::layerIDs()
20022002

20032003
#ifdef QGISDEBUG
20042004
QgsDebugMsg( "QgsLegend::layerIDs()" );
2005-
foreach( QString id, layers )
2005+
foreach ( QString id, layers )
20062006
{
20072007
QgsDebugMsg( id );
20082008
}
@@ -2119,7 +2119,7 @@ void QgsLegend::handleItemChange( QTreeWidgetItem* item, int column )
21192119

21202120
if ( item->isSelected() )
21212121
{
2122-
foreach( QTreeWidgetItem * i, selectedItems() )
2122+
foreach ( QTreeWidgetItem * i, selectedItems() )
21232123
{
21242124
if ( i != item )
21252125
{
@@ -2449,7 +2449,7 @@ void QgsLegend::removeSelectedLayers()
24492449
// Turn off rendering to improve speed.
24502450
mMapCanvas->freeze();
24512451

2452-
foreach( QTreeWidgetItem * item, selectedItems() )
2452+
foreach ( QTreeWidgetItem * item, selectedItems() )
24532453
{
24542454
QgsLegendGroup* lg = dynamic_cast<QgsLegendGroup *>( item );
24552455
if ( lg )
@@ -2476,7 +2476,7 @@ void QgsLegend::setCRSForSelectedLayers( const QgsCoordinateReferenceSystem &crs
24762476
// Turn off rendering to improve speed.
24772477
mMapCanvas->freeze();
24782478

2479-
foreach( QTreeWidgetItem * item, selectedItems() )
2479+
foreach ( QTreeWidgetItem * item, selectedItems() )
24802480
{
24812481
QgsLegendGroup* lg = dynamic_cast<QgsLegendGroup *>( item );
24822482
if ( lg )
@@ -2564,7 +2564,7 @@ void QgsLegend::groupSelectedLayers()
25642564
blockSignals( true );
25652565

25662566
QTreeWidgetItem * parent = 0;
2567-
foreach( QTreeWidgetItem* item, selectedItems() )
2567+
foreach ( QTreeWidgetItem* item, selectedItems() )
25682568
{
25692569
parent = item->parent();
25702570
}
@@ -2585,7 +2585,7 @@ void QgsLegend::groupSelectedLayers()
25852585
QList< QModelIndex > oldIndexes;
25862586
QList< QTreeWidgetItem* > selected;
25872587

2588-
foreach( QTreeWidgetItem * item, selectedItems() )
2588+
foreach ( QTreeWidgetItem * item, selectedItems() )
25892589
{
25902590
QgsLegendLayer* layer = dynamic_cast<QgsLegendLayer *>( item );
25912591
if ( layer )
@@ -2594,7 +2594,7 @@ void QgsLegend::groupSelectedLayers()
25942594
selected.append( item );
25952595
}
25962596
}
2597-
foreach( QTreeWidgetItem * item, selected )
2597+
foreach ( QTreeWidgetItem * item, selected )
25982598
{
25992599
insertItem( item, group );
26002600
}

‎src/app/legend/qgslegendgroup.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ Qt::CheckState QgsLegendGroup::pendingCheckState()
109109
return Qt::PartiallyChecked;
110110

111111
Qt::CheckState theState = elements[0]->checkState( 0 );
112-
foreach( QgsLegendItem * li, elements )
112+
foreach ( QgsLegendItem * li, elements )
113113
{
114114
if ( theState != li->checkState( 0 ) )
115115
{

‎src/app/nodetool/qgsmaptoolnodetool.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -604,13 +604,13 @@ void QgsMapToolNodeTool::deactivate()
604604
void QgsMapToolNodeTool::removeRubberBands()
605605
{
606606
// cleanup rubberbands and list
607-
foreach( QgsRubberBand *rb, mRubberBands )
607+
foreach ( QgsRubberBand *rb, mRubberBands )
608608
{
609609
delete rb;
610610
}
611611
mRubberBands.clear();
612612

613-
foreach( QgsRubberBand *rb, mTopologyRubberBand )
613+
foreach ( QgsRubberBand *rb, mTopologyRubberBand )
614614
{
615615
delete rb;
616616
}

‎src/app/nodetool/qgsselectedfeature.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ void QgsSelectedFeature::validationFinished()
228228
void QgsSelectedFeature::deleteSelectedVertexes()
229229
{
230230
int nSelected = 0;
231-
foreach( QgsVertexEntry *entry, mVertexMap )
231+
foreach ( QgsVertexEntry *entry, mVertexMap )
232232
{
233233
if ( entry->isSelected() )
234234
nSelected++;
@@ -303,7 +303,7 @@ void QgsSelectedFeature::deleteSelectedVertexes()
303303
void QgsSelectedFeature::moveSelectedVertexes( const QgsVector &v )
304304
{
305305
int nUpdates = 0;
306-
foreach( QgsVertexEntry *entry, mVertexMap )
306+
foreach ( QgsVertexEntry *entry, mVertexMap )
307307
{
308308
if ( entry->isSelected() )
309309
nUpdates++;
@@ -370,7 +370,7 @@ void QgsSelectedFeature::replaceVertexMap()
370370

371371
void QgsSelectedFeature::deleteVertexMap()
372372
{
373-
foreach( QgsVertexEntry *entry, mVertexMap )
373+
foreach ( QgsVertexEntry *entry, mVertexMap )
374374
{
375375
delete entry;
376376
}

‎src/app/ogr/qgsogrsublayersdialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ QList<int> QgsOGRSublayersDialog::getSelectionIndexes()
5858

5959
void QgsOGRSublayersDialog::populateLayerTable( QStringList theList, QString delim )
6060
{
61-
foreach( QString item, theList )
61+
foreach ( QString item, theList )
6262
{
6363
layersTable->addTopLevelItem( new QTreeWidgetItem( item.split( delim ) ) );
6464
}

0 commit comments

Comments
 (0)