Applied patch in ticket #34 to 0.7 branch as requested

g_j_m · g_j_m · commit c8a444bd1508 · 2006-05-16T00:47:17.000Z
git-svn-id: http://svn.osgeo.org/qgis/branches/Release-0_7-candidate@5461 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/qgis/src/qgsdlgvectorlayerproperties.cpp b/qgis/src/qgsdlgvectorlayerproperties.cpp
@@ -36,6 +36,8 @@
 #include <qregexp.h>
 #include <qtabwidget.h>
 
+#include <string>
+
 #include "qgis.h"
 #include "qgsrect.h"
 #include "qgsfield.h"
@@ -536,7 +538,7 @@ QString QgsDlgVectorLayerProperties::getMetadata()
 
     if ( ! coordinateTransform )
     {
-        throw QgsCsException( string("unable to get layer coordinate transform object") );
+        throw QgsCsException( std::string("unable to get layer coordinate transform object") );
     }
 
     QgsRect myProjectedExtent = coordinateTransform->transformBoundingBox(layer->extent());
diff --git a/qgis/src/qgsmapcanvas.cpp b/qgis/src/qgsmapcanvas.cpp
@@ -22,6 +22,7 @@
 #include <iosfwd>
 #include <cmath>
 #include <cfloat>
+#include <string>
 
 // added double sentinals to take load off gcc 3.3.3 pre-processor, which was dying
 
@@ -1353,7 +1354,7 @@ void QgsMapCanvas::zoomToSelected()
 #ifdef QGISDEBUG 
             std::cout << "Throwing exception "<< __FILE__ << __LINE__ << std::endl; 
 #endif
-            throw QgsCsException( string("NO COORDINATE TRANSFORM FOUND FOR LAYER") );
+            throw QgsCsException( std::string("NO COORDINATE TRANSFORM FOUND FOR LAYER") );
         }
 
         rect = lyr->coordinateTransform()->transformBoundingBox(lyr->bBoxOfSelected());
@@ -2531,7 +2532,7 @@ void QgsMapCanvas::recalculateExtents()
 #ifdef QGISDEBUG 
         std::cout << "Throwing exception "<< __FILE__ << __LINE__ << std::endl; 
 #endif 
-        throw QgsCsException( string("NO COORDINATE TRANSFORM FOUND FOR LAYER") );
+        throw QgsCsException( std::string("NO COORDINATE TRANSFORM FOUND FOR LAYER") );
       }
 
       std::cout << "Transformed extent" << 
@@ -2555,7 +2556,7 @@ void QgsMapCanvas::recalculateExtents()
 #ifdef QGISDEBUG 
           std::cout << "Throwing exception "<< __FILE__ << __LINE__ << std::endl; 
 #endif 
-          throw QgsCsException( string("NO COORDINATE TRANSFORM FOUND FOR LAYER") );
+          throw QgsCsException( std::string("NO COORDINATE TRANSFORM FOUND FOR LAYER") );
         }
 
         updateFullExtent(lyr->coordinateTransform()->transformBoundingBox(lyr->extent()));

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,8 @@`
`36`	`36`	`#include <qregexp.h>`
`37`	`37`	`#include <qtabwidget.h>`
`38`	`38`
	`39`	`+#include <string>`
	`40`	`+`
`39`	`41`	`#include "qgis.h"`
`40`	`42`	`#include "qgsrect.h"`
`41`	`43`	`#include "qgsfield.h"`
`@@ -536,7 +538,7 @@ QString QgsDlgVectorLayerProperties::getMetadata()`
`536`	`538`
`537`	`539`	`if ( ! coordinateTransform )`
`538`	`540`	`{`
`539`		`- throw QgsCsException( string("unable to get layer coordinate transform object") );`
	`541`	`+ throw QgsCsException( std::string("unable to get layer coordinate transform object") );`
`540`	`542`	`}`
`541`	`543`
`542`	`544`	`QgsRect myProjectedExtent = coordinateTransform->transformBoundingBox(layer->extent());`