Skip to content

Commit

Permalink
add 'foreach' to astyle and re-run indentation
Browse files Browse the repository at this point in the history
  • Loading branch information
@jef-n
jef-n committed Aug 3, 2012
1 parent f8f034c commit 5ae312c
Show file tree
Hide file tree
Showing 126 changed files with 849 additions and 840 deletions.
2 changes: 1 addition & 1 deletion src/app/composer/qgscomposer.cpp
View file
Expand Up @@ -348,7 +348,7 @@ void QgsComposer::setIconSizes( int size )

//Change all current icon sizes.
QList<QToolBar *> toolbars = findChildren<QToolBar *>();
foreach( QToolBar * toolbar, toolbars )
foreach ( QToolBar * toolbar, toolbars )
{
toolbar->setIconSize( QSize( size, size ) );
}
Expand Down
4 changes: 2 additions & 2 deletions src/app/legend/qgslayerorder.cpp
View file
Expand Up @@ -85,7 +85,7 @@ void QgsLayerOrder::refreshLayerList()
{
clear();

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

setCursor( QCursor( Qt::ArrowCursor ) );

foreach( QListWidgetItem *item, mItemsBeingMoved )
foreach ( QListWidgetItem *item, mItemsBeingMoved )
{
if ( mInsertRow >= count() )
{
Expand Down
44 changes: 22 additions & 22 deletions src/app/legend/qgslegend.cpp
View file
Expand Up @@ -65,7 +65,7 @@ static QString getUniqueGroupName( QString prefix, QStringList groups )
match.replaceInStrings( prefix, QString( "" ) );
// find the maximum
int max = 0;
foreach( QString m, match )
foreach ( QString m, match )
{
if ( m.toInt() > max )
max = m.toInt();
Expand Down Expand Up @@ -286,7 +286,7 @@ void QgsLegend::removeGroup( int groupIndex )
void QgsLegend::removeLayers( QStringList theLayers )
{
QgsDebugMsg( "Entering." );
foreach( const QString &myId, theLayers )
foreach ( const QString &myId, theLayers )
{
bool invLayerRemoved = false;

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

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

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

Expand Down Expand Up @@ -556,7 +556,7 @@ void QgsLegend::mouseReleaseEvent( QMouseEvent * e )
hideLine();

// unhide
foreach( QTreeWidgetItem * item, mItemsBeingMoved )
foreach ( QTreeWidgetItem * item, mItemsBeingMoved )
{
item->setHidden( false );
}
Expand All @@ -574,7 +574,7 @@ void QgsLegend::mouseReleaseEvent( QMouseEvent * e )

showItem( "prev sibling", mDropTarget );

foreach( QTreeWidgetItem * item, mItemsBeingMoved )
foreach ( QTreeWidgetItem * item, mItemsBeingMoved )
{
moveItem( item, mDropTarget );
mDropTarget = item;
Expand All @@ -601,7 +601,7 @@ void QgsLegend::mouseReleaseEvent( QMouseEvent * e )
{
showItem( "drop after", mDropTarget );

foreach( QTreeWidgetItem * item, mItemsBeingMoved )
foreach ( QTreeWidgetItem * item, mItemsBeingMoved )
{
moveItem( item, mDropTarget );
mDropTarget = item;
Expand All @@ -612,7 +612,7 @@ void QgsLegend::mouseReleaseEvent( QMouseEvent * e )
{
showItem( "insert into", mDropTarget );

foreach( QTreeWidgetItem * item, mItemsBeingMoved )
foreach ( QTreeWidgetItem * item, mItemsBeingMoved )
{
insertItem( item, mDropTarget );
}
Expand Down Expand Up @@ -968,7 +968,7 @@ void QgsLegend::addLayers( QList<QgsMapLayer *> theLayerList )
!mMapCanvas->mapRenderer()->hasCrsTransformEnabled() )
{
// Verify if all layers have the same CRS
foreach( QgsMapLayer *l, layers() )
foreach ( QgsMapLayer *l, layers() )
{
if ( myPreviousCrs != l->crs() )
{
Expand Down Expand Up @@ -1040,7 +1040,7 @@ QList<QgsMapLayer *> QgsLegend::selectedLayers()
{
QList<QgsMapLayer *> layers;

foreach( QTreeWidgetItem * item, selectedItems() )
foreach ( QTreeWidgetItem * item, selectedItems() )
{
QgsLegendLayer *ll = dynamic_cast<QgsLegendLayer *>( item );
if ( ll )
Expand Down Expand Up @@ -1087,7 +1087,7 @@ QList<QgsLegendLayer *> QgsLegend::legendLayers()

QList< QgsLegendLayer * > ls;

foreach( int o, items.uniqueKeys() )
foreach ( int o, items.uniqueKeys() )
{
QgsDebugMsgLevel( QString( "o=%1" ).arg( o ), 3 );
QList< QgsLegendLayer *> values = items.values( o );
Expand All @@ -1106,7 +1106,7 @@ QList<QgsMapLayer *> QgsLegend::layers()
{
QList<QgsMapLayer *> ls;

foreach( QgsLegendLayer *l, legendLayers() )
foreach ( QgsLegendLayer *l, legendLayers() )
{
ls << l->layer();
}
Expand All @@ -1118,7 +1118,7 @@ QList<QgsMapCanvasLayer> QgsLegend::canvasLayers()
{
QList<QgsMapCanvasLayer> ls;

foreach( QgsLegendLayer *l, legendLayers() )
foreach ( QgsLegendLayer *l, legendLayers() )
{
ls << l->canvasLayer();
}
Expand Down Expand Up @@ -1234,7 +1234,7 @@ void QgsLegend::setGroupCRS( QgsLegendGroup *lg, const QgsCoordinateReferenceSys
return;
}

foreach( QgsLegendLayer *cl, lg->legendLayers() )
foreach ( QgsLegendLayer *cl, lg->legendLayers() )
{
if ( cl )
{
Expand Down Expand Up @@ -1310,7 +1310,7 @@ bool QgsLegend::writeXML( QDomNode &legendnode, QDomDocument &document )

bool QgsLegend::writeXML( QList<QTreeWidgetItem *> items, QDomNode &node, QDomDocument &document )
{
foreach( QTreeWidgetItem * currentItem, items )
foreach ( QTreeWidgetItem * currentItem, items )
{
QgsLegendItem *item = dynamic_cast<QgsLegendItem *>( currentItem );
if ( !item )
Expand Down Expand Up @@ -2002,7 +2002,7 @@ QStringList QgsLegend::layerIDs()

#ifdef QGISDEBUG
QgsDebugMsg( "QgsLegend::layerIDs()" );
foreach( QString id, layers )
foreach ( QString id, layers )
{
QgsDebugMsg( id );
}
Expand Down Expand Up @@ -2119,7 +2119,7 @@ void QgsLegend::handleItemChange( QTreeWidgetItem* item, int column )

if ( item->isSelected() )
{
foreach( QTreeWidgetItem * i, selectedItems() )
foreach ( QTreeWidgetItem * i, selectedItems() )
{
if ( i != item )
{
Expand Down Expand Up @@ -2449,7 +2449,7 @@ void QgsLegend::removeSelectedLayers()
// Turn off rendering to improve speed.
mMapCanvas->freeze();

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

foreach( QTreeWidgetItem * item, selectedItems() )
foreach ( QTreeWidgetItem * item, selectedItems() )
{
QgsLegendGroup* lg = dynamic_cast<QgsLegendGroup *>( item );
if ( lg )
Expand Down Expand Up @@ -2564,7 +2564,7 @@ void QgsLegend::groupSelectedLayers()
blockSignals( true );

QTreeWidgetItem * parent = 0;
foreach( QTreeWidgetItem* item, selectedItems() )
foreach ( QTreeWidgetItem* item, selectedItems() )
{
parent = item->parent();
}
Expand All @@ -2585,7 +2585,7 @@ void QgsLegend::groupSelectedLayers()
QList< QModelIndex > oldIndexes;
QList< QTreeWidgetItem* > selected;

foreach( QTreeWidgetItem * item, selectedItems() )
foreach ( QTreeWidgetItem * item, selectedItems() )
{
QgsLegendLayer* layer = dynamic_cast<QgsLegendLayer *>( item );
if ( layer )
Expand All @@ -2594,7 +2594,7 @@ void QgsLegend::groupSelectedLayers()
selected.append( item );
}
}
foreach( QTreeWidgetItem * item, selected )
foreach ( QTreeWidgetItem * item, selected )
{
insertItem( item, group );
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/legend/qgslegendgroup.cpp
View file
Expand Up @@ -109,7 +109,7 @@ Qt::CheckState QgsLegendGroup::pendingCheckState()
return Qt::PartiallyChecked;

Qt::CheckState theState = elements[0]->checkState( 0 );
foreach( QgsLegendItem * li, elements )
foreach ( QgsLegendItem * li, elements )
{
if ( theState != li->checkState( 0 ) )
{
Expand Down
4 changes: 2 additions & 2 deletions src/app/nodetool/qgsmaptoolnodetool.cpp
View file
Expand Up @@ -604,13 +604,13 @@ void QgsMapToolNodeTool::deactivate()
void QgsMapToolNodeTool::removeRubberBands()
{
// cleanup rubberbands and list
foreach( QgsRubberBand *rb, mRubberBands )
foreach ( QgsRubberBand *rb, mRubberBands )
{
delete rb;
}
mRubberBands.clear();

foreach( QgsRubberBand *rb, mTopologyRubberBand )
foreach ( QgsRubberBand *rb, mTopologyRubberBand )
{
delete rb;
}
Expand Down
6 changes: 3 additions & 3 deletions src/app/nodetool/qgsselectedfeature.cpp
View file
Expand Up @@ -228,7 +228,7 @@ void QgsSelectedFeature::validationFinished()
void QgsSelectedFeature::deleteSelectedVertexes()
{
int nSelected = 0;
foreach( QgsVertexEntry *entry, mVertexMap )
foreach ( QgsVertexEntry *entry, mVertexMap )
{
if ( entry->isSelected() )
nSelected++;
Expand Down Expand Up @@ -303,7 +303,7 @@ void QgsSelectedFeature::deleteSelectedVertexes()
void QgsSelectedFeature::moveSelectedVertexes( const QgsVector &v )
{
int nUpdates = 0;
foreach( QgsVertexEntry *entry, mVertexMap )
foreach ( QgsVertexEntry *entry, mVertexMap )
{
if ( entry->isSelected() )
nUpdates++;
Expand Down Expand Up @@ -370,7 +370,7 @@ void QgsSelectedFeature::replaceVertexMap()

void QgsSelectedFeature::deleteVertexMap()
{
foreach( QgsVertexEntry *entry, mVertexMap )
foreach ( QgsVertexEntry *entry, mVertexMap )
{
delete entry;
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/ogr/qgsogrsublayersdialog.cpp
View file
Expand Up @@ -58,7 +58,7 @@ QList<int> QgsOGRSublayersDialog::getSelectionIndexes()

void QgsOGRSublayersDialog::populateLayerTable( QStringList theList, QString delim )
{
foreach( QString item, theList )
foreach ( QString item, theList )
{
layersTable->addTopLevelItem( new QTreeWidgetItem( item.split( delim ) ) );
}
Expand Down

0 comments on commit 5ae312c

Please sign in to comment.