fix precise build (followup 3667651)

jef-n · jef-n · commit ce6a6902867a · 2015-11-19T12:25:50.000+01:00
diff --git a/python/core/qgsdistancearea.sip b/python/core/qgsdistancearea.sip
@@ -64,9 +64,23 @@ class QgsDistanceArea
     //! measures line
     double measureLine( const QList<QgsPoint>& points );
 
-    //! measures line with one segment
+    /** Measures length of line with one segment
+     * @param p1 start of line
+     * @param p2 end of line
+     * @returns distance in meters, or map units if cartesian calculation was performed
+     */
     double measureLine( const QgsPoint& p1, const QgsPoint& p2 );
 
+    /** Measures length of line with one segment and returns units of distance.
+     * @param p1 start of line
+     * @param p2 end of line
+     * @param units will be set to units of measure
+     * @returns calculated distance between points. Distance units are stored in units parameter.
+     * @note backported from QGIS 2.12 (where it is const)
+     * @note not available in python bindings
+     */
+    // double measureLine( const QgsPoint& p1, const QgsPoint& p2, QGis::UnitType& units );
+
     //! measures polygon area
     double measurePolygon( const QList<QgsPoint>& points );
 
diff --git a/src/core/qgsdistancearea.cpp b/src/core/qgsdistancearea.cpp
@@ -465,7 +465,7 @@ double QgsDistanceArea::measureLine( const QgsPoint &p1, const QgsPoint &p2 )
   return measureLine( p1, p2, units );
 }
 
-double QgsDistanceArea::measureLine( const QgsPoint& p1, const QgsPoint& p2, QGis::UnitType& units ) const
+double QgsDistanceArea::measureLine( const QgsPoint& p1, const QgsPoint& p2, QGis::UnitType& units )
 {
   double result;
   units = mCoordTransform->sourceCrs().mapUnits();
diff --git a/src/core/qgsdistancearea.h b/src/core/qgsdistancearea.h
@@ -100,16 +100,17 @@ class CORE_EXPORT QgsDistanceArea
      * @param p2 end of line
      * @returns distance in meters, or map units if cartesian calculation was performed
      */
-    double measureLine( const QgsPoint& p1, const QgsPoint& p2 ) const;
+    double measureLine( const QgsPoint& p1, const QgsPoint& p2 );
 
     /** Measures length of line with one segment and returns units of distance.
      * @param p1 start of line
      * @param p2 end of line
      * @param units will be set to units of measure
      * @returns calculated distance between points. Distance units are stored in units parameter.
-     * @note added in QGIS 2.12
+     * @note backported from QGIS 2.12 (where it is const)
+     * @note not available in python bindings
      */
-    double measureLine( const QgsPoint& p1, const QgsPoint& p2, QGis::UnitType& units ) const;
+    double measureLine( const QgsPoint& p1, const QgsPoint& p2, QGis::UnitType& units );
 
     //! measures polygon area
     double measurePolygon( const QList<QgsPoint>& points );

Original file line number	Diff line number	Diff line change
`@@ -465,7 +465,7 @@ double QgsDistanceArea::measureLine( const QgsPoint &p1, const QgsPoint &p2 )`
`465`	`465`	`return measureLine( p1, p2, units );`
`466`	`466`	`}`
`467`	`467`
`468`		`-double QgsDistanceArea::measureLine( const QgsPoint& p1, const QgsPoint& p2, QGis::UnitType& units ) const`
	`468`	`+double QgsDistanceArea::measureLine( const QgsPoint& p1, const QgsPoint& p2, QGis::UnitType& units )`
`469`	`469`	`{`
`470`	`470`	`double result;`
`471`	`471`	`units = mCoordTransform->sourceCrs().mapUnits();`