Add const

lbartoletti · lbartoletti · commit 30d9ad8d3a7b · 2017-10-03T18:13:01.000+02:00
diff --git a/src/app/qgsmaptooladdrectangle.cpp b/src/app/qgsmaptooladdrectangle.cpp
@@ -93,7 +93,7 @@ QgsLineString *QgsMapToolAddRectangle::rectangleToLinestring( const bool isOrien
   QgsPoint x1, x2, x3;
   if ( isOriented )
   {
-    double perpendicular = 90.0 * mSide;
+    const double perpendicular = 90.0 * mSide;
     x1 = x0.project( mDistance1, mAzimuth );
     x3 = x0.project( mDistance2, mAzimuth + perpendicular );
     x2 = x1.project( mDistance2, mAzimuth + perpendicular );
diff --git a/src/app/qgsmaptoolcircle2tangentspoint.cpp b/src/app/qgsmaptoolcircle2tangentspoint.cpp
@@ -112,10 +112,10 @@ void QgsMapToolCircle2TangentsPoint::cadCanvasMoveEvent( QgsMapMouseEvent *e )
     }
 
     QgsPoint center = QgsPoint( mCenters.at( 0 ) );
-    double currentDist = mapPoint.distanceSquared( center );
+    const double currentDist = mapPoint.distanceSquared( center );
     for ( int i = 1; i < mCenters.size(); ++i )
     {
-      double testDist = mapPoint.distanceSquared( mCenters.at( i ).x(), mCenters.at( i ).y() );
+      const double testDist = mapPoint.distanceSquared( mCenters.at( i ).x(), mCenters.at( i ).y() );
       if ( testDist < currentDist )
         center = QgsPoint( mCenters.at( i ) );
     }
@@ -264,6 +264,7 @@ void QgsMapToolCircle2TangentsPoint::radiusSpinBoxChanged( int radius )
     std::unique_ptr<QgsMultiPolygonV2> rb( new QgsMultiPolygonV2() );
     for ( int i = 0; i < mCenters.size(); ++i )
     {
+      // TODO: Point instead of polygon?
       std::unique_ptr<QgsGeometryRubberBand> tempRB( createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true ) );
       tempRB->setGeometry( QgsCircle( QgsPoint( mCenters.at( i ) ), static_cast<int>( log10( mRadius ) ) + 1 ).toPolygon() );
       tempRB->show();

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ QgsLineString *QgsMapToolAddRectangle::rectangleToLinestring( const bool isOrien`
`93`	`93`	`QgsPoint x1, x2, x3;`
`94`	`94`	`if ( isOriented )`
`95`	`95`	`{`
`96`		`- double perpendicular = 90.0 * mSide;`
	`96`	`+ const double perpendicular = 90.0 * mSide;`
`97`	`97`	`x1 = x0.project( mDistance1, mAzimuth );`
`98`	`98`	`x3 = x0.project( mDistance2, mAzimuth + perpendicular );`
`99`	`99`	`x2 = x1.project( mDistance2, mAzimuth + perpendicular );`
Original file line number	Diff line number	Diff line change
`@@ -112,10 +112,10 @@ void QgsMapToolCircle2TangentsPoint::cadCanvasMoveEvent( QgsMapMouseEvent *e )`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`QgsPoint center = QgsPoint( mCenters.at( 0 ) );`
`115`		`- double currentDist = mapPoint.distanceSquared( center );`
	`115`	`+ const double currentDist = mapPoint.distanceSquared( center );`
`116`	`116`	`for ( int i = 1; i < mCenters.size(); ++i )`
`117`	`117`	`{`
`118`		`- double testDist = mapPoint.distanceSquared( mCenters.at( i ).x(), mCenters.at( i ).y() );`
	`118`	`+ const double testDist = mapPoint.distanceSquared( mCenters.at( i ).x(), mCenters.at( i ).y() );`
`119`	`119`	`if ( testDist < currentDist )`
`120`	`120`	`center = QgsPoint( mCenters.at( i ) );`
`121`	`121`	`}`
`@@ -264,6 +264,7 @@ void QgsMapToolCircle2TangentsPoint::radiusSpinBoxChanged( int radius )`
`264`	`264`	`std::unique_ptr<QgsMultiPolygonV2> rb( new QgsMultiPolygonV2() );`
`265`	`265`	`for ( int i = 0; i < mCenters.size(); ++i )`
`266`	`266`	`{`
	`267`	`+ // TODO: Point instead of polygon?`
`267`	`268`	`std::unique_ptr<QgsGeometryRubberBand> tempRB( createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true ) );`
`268`	`269`	`tempRB->setGeometry( QgsCircle( QgsPoint( mCenters.at( i ) ), static_cast<int>( log10( mRadius ) ) + 1 ).toPolygon() );`
`269`	`270`	`tempRB->show();`