Fix problem with reporting of line number in exception error messages

g_j_m · g_j_m · commit 6b84471b4c75 · 2006-12-29T09:02:57.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6340 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/gui/qgscoordinatetransform.cpp b/src/gui/qgscoordinatetransform.cpp
@@ -200,7 +200,7 @@ QgsPoint QgsCoordinateTransform::transform(const QgsPoint thePoint,TransformDire
   catch(QgsCsException &cse)
   {
     // rethrow the exception
-    QgsLogger::warning("Throwing exception " + QString(__FILE__) + QString(__LINE__));
+    QgsLogger::warning("Throwing exception " + QString(__FILE__) + QString::number(__LINE__));
     throw cse;
   }
 
@@ -220,7 +220,7 @@ QgsPoint QgsCoordinateTransform::transform(const double theX, const double theY=
   catch(QgsCsException &cse)
   {
     // rethrow the exception
-    QgsLogger::warning("Throwing exception " + QString(__FILE__) + QString(__LINE__));
+    QgsLogger::warning("Throwing exception " + QString(__FILE__) + QString::number(__LINE__));
     throw cse;
   }
 }
@@ -246,7 +246,7 @@ QgsRect QgsCoordinateTransform::transform(const QgsRect theRect,TransformDirecti
   catch(QgsCsException &cse)
   {
     // rethrow the exception
-    QgsLogger::warning("Throwing exception " + QString(__FILE__) + QString(__LINE__));
+    QgsLogger::warning("Throwing exception " + QString(__FILE__) + QString::number(__LINE__));
     throw cse;
   }
 
@@ -280,7 +280,7 @@ void QgsCoordinateTransform::transformInPlace(double& x, double& y, double& z,
   catch(QgsCsException &cse)
   {
     // rethrow the exception 
-    QgsLogger::warning("Throwing exception " + QString(__FILE__) + QString(__LINE__));
+    QgsLogger::warning("Throwing exception " + QString(__FILE__) + QString::number(__LINE__));
     throw cse;
   }
 }
@@ -306,7 +306,7 @@ void QgsCoordinateTransform::transformInPlace(std::vector<double>& x,
   catch(QgsCsException &cse)
   {
     // rethrow the exception
-    QgsLogger::warning("Throwing exception " + QString(__FILE__) + QString(__LINE__));
+    QgsLogger::warning("Throwing exception " + QString(__FILE__) + QString::number(__LINE__));
     throw cse;
   }
 }
@@ -369,7 +369,7 @@ QgsRect QgsCoordinateTransform::transformBoundingBox(const QgsRect rect, Transfo
   catch(QgsCsException &cse)
   {
   // rethrow the exception
-    QgsLogger::warning("Throwing exception " + QString(__FILE__) + QString(__LINE__));
+    QgsLogger::warning("Throwing exception " + QString(__FILE__) + QString::number(__LINE__));
     throw cse;
   }
 
@@ -475,7 +475,7 @@ void QgsCoordinateTransform::transformCoords( const int& numPoints, double *x, d
   QgsDebugMsg("Projection failed emitting invalid transform signal: " + QString(msg.toLocal8Bit().data()));
 #endif
   emit invalidTransformInput();
-    QgsLogger::warning("Throwing exception " + QString(__FILE__) + QString(__LINE__));
+    QgsLogger::warning("Throwing exception " + QString(__FILE__) + QString::number(__LINE__));
     throw  QgsCsException(msg);
   }
   // if the result is lat/long, convert the results from radians back

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ QgsPoint QgsCoordinateTransform::transform(const QgsPoint thePoint,TransformDire`
`200`	`200`	`catch(QgsCsException &cse)`
`201`	`201`	`{`
`202`	`202`	`// rethrow the exception`
`203`		`- QgsLogger::warning("Throwing exception " + QString(__FILE__) + QString(__LINE__));`
	`203`	`+ QgsLogger::warning("Throwing exception " + QString(__FILE__) + QString::number(__LINE__));`
`204`	`204`	`throw cse;`
`205`	`205`	`}`
`206`	`206`
`@@ -220,7 +220,7 @@ QgsPoint QgsCoordinateTransform::transform(const double theX, const double theY=`
`220`	`220`	`catch(QgsCsException &cse)`
`221`	`221`	`{`
`222`	`222`	`// rethrow the exception`
`223`		`- QgsLogger::warning("Throwing exception " + QString(__FILE__) + QString(__LINE__));`
	`223`	`+ QgsLogger::warning("Throwing exception " + QString(__FILE__) + QString::number(__LINE__));`
`224`	`224`	`throw cse;`
`225`	`225`	`}`
`226`	`226`	`}`
`@@ -246,7 +246,7 @@ QgsRect QgsCoordinateTransform::transform(const QgsRect theRect,TransformDirecti`
`246`	`246`	`catch(QgsCsException &cse)`
`247`	`247`	`{`
`248`	`248`	`// rethrow the exception`
`249`		`- QgsLogger::warning("Throwing exception " + QString(__FILE__) + QString(__LINE__));`
	`249`	`+ QgsLogger::warning("Throwing exception " + QString(__FILE__) + QString::number(__LINE__));`
`250`	`250`	`throw cse;`
`251`	`251`	`}`
`252`	`252`
`@@ -280,7 +280,7 @@ void QgsCoordinateTransform::transformInPlace(double& x, double& y, double& z,`
`280`	`280`	`catch(QgsCsException &cse)`
`281`	`281`	`{`
`282`	`282`	`// rethrow the exception`
`283`		`- QgsLogger::warning("Throwing exception " + QString(__FILE__) + QString(__LINE__));`
	`283`	`+ QgsLogger::warning("Throwing exception " + QString(__FILE__) + QString::number(__LINE__));`
`284`	`284`	`throw cse;`
`285`	`285`	`}`
`286`	`286`	`}`
`@@ -306,7 +306,7 @@ void QgsCoordinateTransform::transformInPlace(std::vector<double>& x,`
`306`	`306`	`catch(QgsCsException &cse)`
`307`	`307`	`{`
`308`	`308`	`// rethrow the exception`
`309`		`- QgsLogger::warning("Throwing exception " + QString(__FILE__) + QString(__LINE__));`
	`309`	`+ QgsLogger::warning("Throwing exception " + QString(__FILE__) + QString::number(__LINE__));`
`310`	`310`	`throw cse;`
`311`	`311`	`}`
`312`	`312`	`}`
`@@ -369,7 +369,7 @@ QgsRect QgsCoordinateTransform::transformBoundingBox(const QgsRect rect, Transfo`
`369`	`369`	`catch(QgsCsException &cse)`
`370`	`370`	`{`
`371`	`371`	`// rethrow the exception`
`372`		`- QgsLogger::warning("Throwing exception " + QString(__FILE__) + QString(__LINE__));`
	`372`	`+ QgsLogger::warning("Throwing exception " + QString(__FILE__) + QString::number(__LINE__));`
`373`	`373`	`throw cse;`
`374`	`374`	`}`
`375`	`375`
`@@ -475,7 +475,7 @@ void QgsCoordinateTransform::transformCoords( const int& numPoints, double *x, d`
`475`	`475`	`QgsDebugMsg("Projection failed emitting invalid transform signal: " + QString(msg.toLocal8Bit().data()));`
`476`	`476`	`#endif`
`477`	`477`	`emit invalidTransformInput();`
`478`		`- QgsLogger::warning("Throwing exception " + QString(__FILE__) + QString(__LINE__));`
	`478`	`+ QgsLogger::warning("Throwing exception " + QString(__FILE__) + QString::number(__LINE__));`
`479`	`479`	`throw QgsCsException(msg);`
`480`	`480`	`}`
`481`	`481`	`// if the result is lat/long, convert the results from radians back`