Replace foreach with Q_FOREACH

mhugent · mhugent · commit 70b25bbff948 · 2015-09-16T07:45:32.000+02:00
diff --git a/src/app/nodetool/qgsmaptoolnodetool.cpp b/src/app/nodetool/qgsmaptoolnodetool.cpp
@@ -53,7 +53,7 @@ void QgsMapToolNodeTool::createTopologyRubberBands()
 {
   QgsVectorLayer* vlayer = mSelectedFeature->vlayer();
 
-  foreach ( const QgsVertexEntry* vertexEntry, mSelectedFeature->vertexMap() )
+  Q_FOREACH ( const QgsVertexEntry* vertexEntry, mSelectedFeature->vertexMap() )
   {
     if ( !vertexEntry->isSelected() )
     {
@@ -63,7 +63,7 @@ void QgsMapToolNodeTool::createTopologyRubberBands()
     // Snap vertex
     QMultiMap<double, QgsSnappingResult> snapResults;
     vlayer->snapWithContext( vertexEntry->pointV1(), ZERO_TOLERANCE, snapResults, QgsSnapper::SnapToVertex );
-    foreach ( const QgsSnappingResult& snapResult, snapResults.values() )
+    Q_FOREACH ( const QgsSnappingResult& snapResult, snapResults.values() )
     {
       // Get geometry of snapped feature
       QgsFeatureId snapFeatureId = snapResult.snappedAtGeometry;
@@ -120,7 +120,7 @@ void QgsMapToolNodeTool::canvasMoveEvent( QgsMapMouseEvent* e )
         rbGeom->transform( *mCanvas->mapSettings().layerTransform( vlayer ) );
       rb->setGeometry( rbGeom );
       mMoveRubberBands.insert( mSelectedFeature->featureId(), rb );
-      foreach ( const QgsVertexEntry* vertexEntry, mSelectedFeature->vertexMap() )
+      Q_FOREACH ( const QgsVertexEntry* vertexEntry, mSelectedFeature->vertexMap() )
       {
         if ( vertexEntry->isSelected() )
           mMoveVertices[mSelectedFeature->featureId()].append( qMakePair( vertexEntry->vertexId(), toMapCoordinates( vlayer, vertexEntry->point() ) ) );
@@ -141,10 +141,10 @@ void QgsMapToolNodeTool::canvasMoveEvent( QgsMapMouseEvent* e )
       double deltaX = curPos.x() - pressPos.x();
       double deltaY = curPos.y() - pressPos.y();
 
-      foreach ( const QgsFeatureId& fid, mMoveRubberBands.keys() )
+      Q_FOREACH ( const QgsFeatureId& fid, mMoveRubberBands.keys() )
       {
         typedef QPair<QgsVertexId, QgsPointV2> MoveVertex;
-        foreach ( const MoveVertex& pair, mMoveVertices[fid] )
+        Q_FOREACH ( const MoveVertex& pair, mMoveVertices[fid] )
         {
           QgsPointV2 newPos( pair.second.x() + deltaX, pair.second.y() + deltaY );
           mMoveRubberBands.value( fid )->moveVertex( pair.first, newPos );
diff --git a/src/app/nodetool/qgsnodeeditor.cpp b/src/app/nodetool/qgsnodeeditor.cpp
@@ -109,7 +109,7 @@ void QgsNodeEditor::rebuildTable()
   mTableWidget->setRowCount( 0 );
   int row = 0;
   bool hasR = false;
-  foreach ( const QgsVertexEntry* entry, mSelectedFeature->vertexMap() )
+  Q_FOREACH ( const QgsVertexEntry* entry, mSelectedFeature->vertexMap() )
   {
     mTableWidget->insertRow( row );
 
@@ -227,7 +227,7 @@ void QgsNodeEditor::updateNodeSelection()
 {
   mSelectedFeature->blockSignals( true );
   mSelectedFeature->deselectAllVertexes();
-  foreach ( const QModelIndex& index, mTableWidget->selectionModel()->selectedRows() )
+  Q_FOREACH ( const QModelIndex& index, mTableWidget->selectionModel()->selectedRows() )
   {
     int nodeIdx = mTableWidget->item( index.row(), 0 )->data( Qt::DisplayRole ).toInt();
     mSelectedFeature->selectVertex( nodeIdx );
diff --git a/src/app/nodetool/qgsselectedfeature.cpp b/src/app/nodetool/qgsselectedfeature.cpp
@@ -230,7 +230,7 @@ void QgsSelectedFeature::validationFinished()
 void QgsSelectedFeature::deleteSelectedVertexes()
 {
   int nSelected = 0;
-  foreach ( QgsVertexEntry *entry, mVertexMap )
+  Q_FOREACH ( QgsVertexEntry *entry, mVertexMap )
   {
     if ( entry->isSelected() )
       nSelected++;
@@ -302,7 +302,7 @@ void QgsSelectedFeature::deleteSelectedVertexes()
 void QgsSelectedFeature::moveSelectedVertexes( const QgsVector &v )
 {
   int nUpdates = 0;
-  foreach ( QgsVertexEntry *entry, mVertexMap )
+  Q_FOREACH ( QgsVertexEntry *entry, mVertexMap )
   {
     if ( entry->isSelected() )
       nUpdates++;
@@ -375,7 +375,7 @@ void QgsSelectedFeature::replaceVertexMap()
 
 void QgsSelectedFeature::deleteVertexMap()
 {
-  foreach ( QgsVertexEntry *entry, mVertexMap )
+  Q_FOREACH ( QgsVertexEntry *entry, mVertexMap )
   {
     delete entry;
   }
@@ -468,7 +468,7 @@ void QgsSelectedFeature::invertVertexSelection( int vertexNr )
 
 void QgsSelectedFeature::updateVertexMarkersPosition()
 {
-  foreach ( QgsVertexEntry* vertexEntry, mVertexMap )
+  Q_FOREACH ( QgsVertexEntry* vertexEntry, mVertexMap )
   {
     vertexEntry->placeMarker();
   }

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ void QgsMapToolNodeTool::createTopologyRubberBands()`
`53`	`53`	`{`
`54`	`54`	`QgsVectorLayer* vlayer = mSelectedFeature->vlayer();`
`55`	`55`
`56`		`- foreach ( const QgsVertexEntry* vertexEntry, mSelectedFeature->vertexMap() )`
	`56`	`+ Q_FOREACH ( const QgsVertexEntry* vertexEntry, mSelectedFeature->vertexMap() )`
`57`	`57`	`{`
`58`	`58`	`if ( !vertexEntry->isSelected() )`
`59`	`59`	`{`
`@@ -63,7 +63,7 @@ void QgsMapToolNodeTool::createTopologyRubberBands()`
`63`	`63`	`// Snap vertex`
`64`	`64`	`QMultiMap<double, QgsSnappingResult> snapResults;`
`65`	`65`	`vlayer->snapWithContext( vertexEntry->pointV1(), ZERO_TOLERANCE, snapResults, QgsSnapper::SnapToVertex );`
`66`		`- foreach ( const QgsSnappingResult& snapResult, snapResults.values() )`
	`66`	`+ Q_FOREACH ( const QgsSnappingResult& snapResult, snapResults.values() )`
`67`	`67`	`{`
`68`	`68`	`// Get geometry of snapped feature`
`69`	`69`	`QgsFeatureId snapFeatureId = snapResult.snappedAtGeometry;`
`@@ -120,7 +120,7 @@ void QgsMapToolNodeTool::canvasMoveEvent( QgsMapMouseEvent* e )`
`120`	`120`	`rbGeom->transform( *mCanvas->mapSettings().layerTransform( vlayer ) );`
`121`	`121`	`rb->setGeometry( rbGeom );`
`122`	`122`	`mMoveRubberBands.insert( mSelectedFeature->featureId(), rb );`
`123`		`- foreach ( const QgsVertexEntry* vertexEntry, mSelectedFeature->vertexMap() )`
	`123`	`+ Q_FOREACH ( const QgsVertexEntry* vertexEntry, mSelectedFeature->vertexMap() )`
`124`	`124`	`{`
`125`	`125`	`if ( vertexEntry->isSelected() )`
`126`	`126`	`mMoveVertices[mSelectedFeature->featureId()].append( qMakePair( vertexEntry->vertexId(), toMapCoordinates( vlayer, vertexEntry->point() ) ) );`
`@@ -141,10 +141,10 @@ void QgsMapToolNodeTool::canvasMoveEvent( QgsMapMouseEvent* e )`
`141`	`141`	`double deltaX = curPos.x() - pressPos.x();`
`142`	`142`	`double deltaY = curPos.y() - pressPos.y();`
`143`	`143`
`144`		`- foreach ( const QgsFeatureId& fid, mMoveRubberBands.keys() )`
	`144`	`+ Q_FOREACH ( const QgsFeatureId& fid, mMoveRubberBands.keys() )`
`145`	`145`	`{`
`146`	`146`	`typedef QPair<QgsVertexId, QgsPointV2> MoveVertex;`
`147`		`- foreach ( const MoveVertex& pair, mMoveVertices[fid] )`
	`147`	`+ Q_FOREACH ( const MoveVertex& pair, mMoveVertices[fid] )`
`148`	`148`	`{`
`149`	`149`	`QgsPointV2 newPos( pair.second.x() + deltaX, pair.second.y() + deltaY );`
`150`	`150`	`mMoveRubberBands.value( fid )->moveVertex( pair.first, newPos );`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ void QgsNodeEditor::rebuildTable()`
`109`	`109`	`mTableWidget->setRowCount( 0 );`
`110`	`110`	`int row = 0;`
`111`	`111`	`bool hasR = false;`
`112`		`- foreach ( const QgsVertexEntry* entry, mSelectedFeature->vertexMap() )`
	`112`	`+ Q_FOREACH ( const QgsVertexEntry* entry, mSelectedFeature->vertexMap() )`
`113`	`113`	`{`
`114`	`114`	`mTableWidget->insertRow( row );`
`115`	`115`
`@@ -227,7 +227,7 @@ void QgsNodeEditor::updateNodeSelection()`
`227`	`227`	`{`
`228`	`228`	`mSelectedFeature->blockSignals( true );`
`229`	`229`	`mSelectedFeature->deselectAllVertexes();`
`230`		`- foreach ( const QModelIndex& index, mTableWidget->selectionModel()->selectedRows() )`
	`230`	`+ Q_FOREACH ( const QModelIndex& index, mTableWidget->selectionModel()->selectedRows() )`
`231`	`231`	`{`
`232`	`232`	`int nodeIdx = mTableWidget->item( index.row(), 0 )->data( Qt::DisplayRole ).toInt();`
`233`	`233`	`mSelectedFeature->selectVertex( nodeIdx );`
Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@ void QgsSelectedFeature::validationFinished()`
`230`	`230`	`void QgsSelectedFeature::deleteSelectedVertexes()`
`231`	`231`	`{`
`232`	`232`	`int nSelected = 0;`
`233`		`- foreach ( QgsVertexEntry *entry, mVertexMap )`
	`233`	`+ Q_FOREACH ( QgsVertexEntry *entry, mVertexMap )`
`234`	`234`	`{`
`235`	`235`	`if ( entry->isSelected() )`
`236`	`236`	`nSelected++;`
`@@ -302,7 +302,7 @@ void QgsSelectedFeature::deleteSelectedVertexes()`
`302`	`302`	`void QgsSelectedFeature::moveSelectedVertexes( const QgsVector &v )`
`303`	`303`	`{`
`304`	`304`	`int nUpdates = 0;`
`305`		`- foreach ( QgsVertexEntry *entry, mVertexMap )`
	`305`	`+ Q_FOREACH ( QgsVertexEntry *entry, mVertexMap )`
`306`	`306`	`{`
`307`	`307`	`if ( entry->isSelected() )`
`308`	`308`	`nUpdates++;`
`@@ -375,7 +375,7 @@ void QgsSelectedFeature::replaceVertexMap()`
`375`	`375`
`376`	`376`	`void QgsSelectedFeature::deleteVertexMap()`
`377`	`377`	`{`
`378`		`- foreach ( QgsVertexEntry *entry, mVertexMap )`
	`378`	`+ Q_FOREACH ( QgsVertexEntry *entry, mVertexMap )`
`379`	`379`	`{`
`380`	`380`	`delete entry;`
`381`	`381`	`}`
`@@ -468,7 +468,7 @@ void QgsSelectedFeature::invertVertexSelection( int vertexNr )`
`468`	`468`
`469`	`469`	`void QgsSelectedFeature::updateVertexMarkersPosition()`
`470`	`470`	`{`
`471`		`- foreach ( QgsVertexEntry* vertexEntry, mVertexMap )`
	`471`	`+ Q_FOREACH ( QgsVertexEntry* vertexEntry, mVertexMap )`
`472`	`472`	`{`
`473`	`473`	`vertexEntry->placeMarker();`
`474`	`474`	`}`