Use constGeometry() instead of geometry() where possible

mhugent · mhugent · commit a972a3020ce4 · 2015-07-22T17:35:50.000+02:00
diff --git a/src/app/nodetool/qgsmaptoolnodetool.cpp b/src/app/nodetool/qgsmaptoolnodetool.cpp
@@ -410,25 +410,25 @@ void QgsMapToolNodeTool::createTopologyRubberBands()
       }
       // Get VertexId of snapped vertex
       QgsVertexId vid;
-      if ( !feature.geometry()->vertexIdFromVertexNr( snapResult.snappedVertexNr, vid ) )
+      if ( !feature.constGeometry()->vertexIdFromVertexNr( snapResult.snappedVertexNr, vid ) )
       {
         continue;
       }
       // Add rubberband if not already added
       if ( !mMoveRubberBands.contains( snapFeatureId ) )
       {
-        QgsGeometryRubberBand* rb = new QgsGeometryRubberBand( mCanvas, feature.geometry()->type() );
+        QgsGeometryRubberBand* rb = new QgsGeometryRubberBand( mCanvas, feature.constGeometry()->type() );
         rb->setOutlineColor( Qt::blue );
         rb->setBrushStyle( Qt::NoBrush );
         rb->setOutlineWidth( 2 );
-        QgsAbstractGeometryV2* rbGeom = feature.geometry()->geometry()->clone();
+        QgsAbstractGeometryV2* rbGeom = feature.constGeometry()->geometry()->clone();
         if ( mCanvas->mapSettings().layerTransform( vlayer ) )
           rbGeom->transform( *mCanvas->mapSettings().layerTransform( vlayer ) );
         rb->setGeometry( rbGeom );
         mMoveRubberBands.insert( snapFeatureId, rb );
       }
       // Add to list of vertices to be moved
-      mMoveVertices[snapFeatureId].append( qMakePair( vid, toMapCoordinates( vlayer, feature.geometry()->geometry()->vertexAt( vid ) ) ) );
+      mMoveVertices[snapFeatureId].append( qMakePair( vid, toMapCoordinates( vlayer, feature.constGeometry()->geometry()->vertexAt( vid ) ) ) );
     }
   }
 }
diff --git a/src/app/nodetool/qgsselectedfeature.cpp b/src/app/nodetool/qgsselectedfeature.cpp
@@ -79,7 +79,7 @@ void QgsSelectedFeature::updateGeometry( QgsGeometry *geom )
     QgsFeature f;
     if ( mVlayer->getFeatures( QgsFeatureRequest().setFilterFid( mFeatureId ) ).nextFeature( f ) )
     {
-      mGeometry = new QgsGeometry( *f.geometry() );
+      mGeometry = new QgsGeometry( *f.constGeometry() );
     }
   }
   else
diff --git a/src/core/qgsvectorlayereditutils.cpp b/src/core/qgsvectorlayereditutils.cpp
@@ -66,7 +66,7 @@ bool QgsVectorLayerEditUtils::moveVertex( const QgsPointV2& p, QgsFeatureId atFe
   {
     // it's not in cache: let's fetch it from layer
     QgsFeature f;
-    if ( !L->getFeatures( QgsFeatureRequest().setFilterFid( atFeatureId ).setSubsetOfAttributes( QgsAttributeList() ) ).nextFeature( f ) || !f.geometry() )
+    if ( !L->getFeatures( QgsFeatureRequest().setFilterFid( atFeatureId ).setSubsetOfAttributes( QgsAttributeList() ) ).nextFeature( f ) || !f.constGeometry() )
       return false; // geometry not found
 
     geometry = *f.geometry();

Original file line number	Diff line number	Diff line change
`@@ -410,25 +410,25 @@ void QgsMapToolNodeTool::createTopologyRubberBands()`
`410`	`410`	`}`
`411`	`411`	`// Get VertexId of snapped vertex`
`412`	`412`	`QgsVertexId vid;`
`413`		`- if ( !feature.geometry()->vertexIdFromVertexNr( snapResult.snappedVertexNr, vid ) )`
	`413`	`+ if ( !feature.constGeometry()->vertexIdFromVertexNr( snapResult.snappedVertexNr, vid ) )`
`414`	`414`	`{`
`415`	`415`	`continue;`
`416`	`416`	`}`
`417`	`417`	`// Add rubberband if not already added`
`418`	`418`	`if ( !mMoveRubberBands.contains( snapFeatureId ) )`
`419`	`419`	`{`
`420`		`- QgsGeometryRubberBand* rb = new QgsGeometryRubberBand( mCanvas, feature.geometry()->type() );`
	`420`	`+ QgsGeometryRubberBand* rb = new QgsGeometryRubberBand( mCanvas, feature.constGeometry()->type() );`
`421`	`421`	`rb->setOutlineColor( Qt::blue );`
`422`	`422`	`rb->setBrushStyle( Qt::NoBrush );`
`423`	`423`	`rb->setOutlineWidth( 2 );`
`424`		`- QgsAbstractGeometryV2* rbGeom = feature.geometry()->geometry()->clone();`
	`424`	`+ QgsAbstractGeometryV2* rbGeom = feature.constGeometry()->geometry()->clone();`
`425`	`425`	`if ( mCanvas->mapSettings().layerTransform( vlayer ) )`
`426`	`426`	`rbGeom->transform( *mCanvas->mapSettings().layerTransform( vlayer ) );`
`427`	`427`	`rb->setGeometry( rbGeom );`
`428`	`428`	`mMoveRubberBands.insert( snapFeatureId, rb );`
`429`	`429`	`}`
`430`	`430`	`// Add to list of vertices to be moved`
`431`		`- mMoveVertices[snapFeatureId].append( qMakePair( vid, toMapCoordinates( vlayer, feature.geometry()->geometry()->vertexAt( vid ) ) ) );`
	`431`	`+ mMoveVertices[snapFeatureId].append( qMakePair( vid, toMapCoordinates( vlayer, feature.constGeometry()->geometry()->vertexAt( vid ) ) ) );`
`432`	`432`	`}`
`433`	`433`	`}`
`434`	`434`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ void QgsSelectedFeature::updateGeometry( QgsGeometry *geom )`
`79`	`79`	`QgsFeature f;`
`80`	`80`	`if ( mVlayer->getFeatures( QgsFeatureRequest().setFilterFid( mFeatureId ) ).nextFeature( f ) )`
`81`	`81`	`{`
`82`		`- mGeometry = new QgsGeometry( *f.geometry() );`
	`82`	`+ mGeometry = new QgsGeometry( *f.constGeometry() );`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`	`else`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ bool QgsVectorLayerEditUtils::moveVertex( const QgsPointV2& p, QgsFeatureId atFe`
`66`	`66`	`{`
`67`	`67`	`// it's not in cache: let's fetch it from layer`
`68`	`68`	`QgsFeature f;`
`69`		`- if ( !L->getFeatures( QgsFeatureRequest().setFilterFid( atFeatureId ).setSubsetOfAttributes( QgsAttributeList() ) ).nextFeature( f ) \|\| !f.geometry() )`
	`69`	`+ if ( !L->getFeatures( QgsFeatureRequest().setFilterFid( atFeatureId ).setSubsetOfAttributes( QgsAttributeList() ) ).nextFeature( f ) \|\| !f.constGeometry() )`
`70`	`70`	`return false; // geometry not found`
`71`	`71`
`72`	`72`	`geometry = *f.geometry();`