Rename variable from beforeIndex to afterIndex

mhugent · mhugent · commit 49b1ad34a6b8 · 2012-04-13T15:57:35.000+02:00
diff --git a/src/core/qgsgeometry.cpp b/src/core/qgsgeometry.cpp
@@ -2405,7 +2405,7 @@ double QgsGeometry::closestVertexWithContext( const QgsPoint& point, int& atVert
 double QgsGeometry::closestSegmentWithContext(
   const QgsPoint& point,
   QgsPoint& minDistPoint,
-  int& beforeVertex,
+  int& afterVertex,
   double* leftOf )
 {
   QgsDebugMsg( "Entering." );
@@ -2484,7 +2484,7 @@ double QgsGeometry::closestSegmentWithContext(
           ptr += sizeof( double );
         }
       }
-      beforeVertex = closestSegmentIndex;
+      afterVertex = closestSegmentIndex;
       break;
     }
     case QGis::WKBMultiLineString25D:
@@ -2531,7 +2531,7 @@ double QgsGeometry::closestSegmentWithContext(
           ++pointindex;
         }
       }
-      beforeVertex = closestSegmentIndex;
+      afterVertex = closestSegmentIndex;
       break;
     }
     case QGis::WKBPolygon25D:
@@ -2577,7 +2577,7 @@ double QgsGeometry::closestSegmentWithContext(
           ++index;
         }
       }
-      beforeVertex = closestSegmentIndex;
+      afterVertex = closestSegmentIndex;
       break;
     }
     case QGis::WKBMultiPolygon25D:
@@ -2630,7 +2630,7 @@ double QgsGeometry::closestSegmentWithContext(
           }
         }
       }
-      beforeVertex = closestSegmentIndex;
+      afterVertex = closestSegmentIndex;
       break;
     }
     case QGis::WKBUnknown:
diff --git a/src/core/qgsgeometry.h b/src/core/qgsgeometry.h
@@ -239,12 +239,12 @@ class CORE_EXPORT QgsGeometry
      * Searches for the closest segment of geometry to the given point
      * @param point Specifies the point for search
      * @param minDistPoint Receives the nearest point on the segment
-     * @param beforeVertex Receives index of the vertex before the closest segment. The vertex
-     * after the closest segment is always beforeVertex + 1
+     * @param afterVertex Receives index of the vertex after the closest segment. The vertex
+     * before the closest segment is always afterVertex - 1
      * @param leftOf Out: Returns if the point lies on the left of right side of the segment ( < 0 means left, > 0 means right )
      * @return The squared cartesian distance is also returned in sqrDist, negative number on error
      */
-    double closestSegmentWithContext( const QgsPoint& point, QgsPoint& minDistPoint, int& beforeVertex, double* leftOf = 0 );
+    double closestSegmentWithContext( const QgsPoint& point, QgsPoint& minDistPoint, int& afterVertex, double* leftOf = 0 );
 
     /**Adds a new ring to this geometry. This makes only sense for polygon and multipolygons.
      @return 0 in case of success (ring added), 1 problem with geometry type, 2 ring not closed,

Original file line number	Diff line number	Diff line change
`@@ -2405,7 +2405,7 @@ double QgsGeometry::closestVertexWithContext( const QgsPoint& point, int& atVert`
`2405`	`2405`	`double QgsGeometry::closestSegmentWithContext(`
`2406`	`2406`	`const QgsPoint& point,`
`2407`	`2407`	`QgsPoint& minDistPoint,`
`2408`		`- int& beforeVertex,`
	`2408`	`+ int& afterVertex,`
`2409`	`2409`	`double* leftOf )`
`2410`	`2410`	`{`
`2411`	`2411`	`QgsDebugMsg( "Entering." );`
`@@ -2484,7 +2484,7 @@ double QgsGeometry::closestSegmentWithContext(`
`2484`	`2484`	`ptr += sizeof( double );`
`2485`	`2485`	`}`
`2486`	`2486`	`}`
`2487`		`- beforeVertex = closestSegmentIndex;`
	`2487`	`+ afterVertex = closestSegmentIndex;`
`2488`	`2488`	`break;`
`2489`	`2489`	`}`
`2490`	`2490`	`case QGis::WKBMultiLineString25D:`
`@@ -2531,7 +2531,7 @@ double QgsGeometry::closestSegmentWithContext(`
`2531`	`2531`	`++pointindex;`
`2532`	`2532`	`}`
`2533`	`2533`	`}`
`2534`		`- beforeVertex = closestSegmentIndex;`
	`2534`	`+ afterVertex = closestSegmentIndex;`
`2535`	`2535`	`break;`
`2536`	`2536`	`}`
`2537`	`2537`	`case QGis::WKBPolygon25D:`
`@@ -2577,7 +2577,7 @@ double QgsGeometry::closestSegmentWithContext(`
`2577`	`2577`	`++index;`
`2578`	`2578`	`}`
`2579`	`2579`	`}`
`2580`		`- beforeVertex = closestSegmentIndex;`
	`2580`	`+ afterVertex = closestSegmentIndex;`
`2581`	`2581`	`break;`
`2582`	`2582`	`}`
`2583`	`2583`	`case QGis::WKBMultiPolygon25D:`
`@@ -2630,7 +2630,7 @@ double QgsGeometry::closestSegmentWithContext(`
`2630`	`2630`	`}`
`2631`	`2631`	`}`
`2632`	`2632`	`}`
`2633`		`- beforeVertex = closestSegmentIndex;`
	`2633`	`+ afterVertex = closestSegmentIndex;`
`2634`	`2634`	`break;`
`2635`	`2635`	`}`
`2636`	`2636`	`case QGis::WKBUnknown:`