Skip to content
Permalink
Browse files
Move from "or", "and" to proper C-style ||, &&
  • Loading branch information
wonder-sk committed Apr 13, 2017
1 parent 2e21d46 commit 92e3e75f3d1e1a8406a350b6c1910215dd69a6d6
Showing with 2 additions and 2 deletions.
  1. +2 −2 src/app/nodetool/qgsnodetool2.cpp
@@ -57,7 +57,7 @@ static bool isEndpointAtVertexIndex( const QgsGeometry &geom, int vertexIndex )
QgsAbstractGeometry *g = geom.geometry();
if ( QgsCurve *curve = dynamic_cast<QgsCurve *>( g ) )
{
return vertexIndex == 0 or vertexIndex == curve->numPoints() - 1;
return vertexIndex == 0 || vertexIndex == curve->numPoints() - 1;
}
else if ( QgsMultiCurve *multiCurve = dynamic_cast<QgsMultiCurve *>( g ) )
{
@@ -650,7 +650,7 @@ bool QgsNodeTool2::isNearEndpointMarker( const QgsPoint &mapPoint )
QgsPoint vertexPoint = QgsPoint( vertexPointV2.x(), vertexPointV2.y() );
double distVertex = sqrt( vertexPoint.sqrDist( mapPoint ) );

return distMarker < tol and distMarker < distVertex;
return distMarker < tol && distMarker < distVertex;
}

bool QgsNodeTool2::isMatchAtEndpoint( const QgsPointLocator::Match &match )

0 comments on commit 92e3e75

Please sign in to comment.