Skip to content

Commit c8a444b

Browse files
author
g_j_m
committedMay 16, 2006
Applied patch in ticket #34 to 0.7 branch as requested
git-svn-id: http://svn.osgeo.org/qgis/branches/Release-0_7-candidate@5461 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent e18d898 commit c8a444b

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed
 

‎qgis/src/qgsdlgvectorlayerproperties.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
#include <qregexp.h>
3737
#include <qtabwidget.h>
3838

39+
#include <string>
40+
3941
#include "qgis.h"
4042
#include "qgsrect.h"
4143
#include "qgsfield.h"
@@ -536,7 +538,7 @@ QString QgsDlgVectorLayerProperties::getMetadata()
536538

537539
if ( ! coordinateTransform )
538540
{
539-
throw QgsCsException( string("unable to get layer coordinate transform object") );
541+
throw QgsCsException( std::string("unable to get layer coordinate transform object") );
540542
}
541543

542544
QgsRect myProjectedExtent = coordinateTransform->transformBoundingBox(layer->extent());

‎qgis/src/qgsmapcanvas.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <iosfwd>
2323
#include <cmath>
2424
#include <cfloat>
25+
#include <string>
2526

2627
// added double sentinals to take load off gcc 3.3.3 pre-processor, which was dying
2728

@@ -1353,7 +1354,7 @@ void QgsMapCanvas::zoomToSelected()
13531354
#ifdef QGISDEBUG
13541355
std::cout << "Throwing exception "<< __FILE__ << __LINE__ << std::endl;
13551356
#endif
1356-
throw QgsCsException( string("NO COORDINATE TRANSFORM FOUND FOR LAYER") );
1357+
throw QgsCsException( std::string("NO COORDINATE TRANSFORM FOUND FOR LAYER") );
13571358
}
13581359

13591360
rect = lyr->coordinateTransform()->transformBoundingBox(lyr->bBoxOfSelected());
@@ -2531,7 +2532,7 @@ void QgsMapCanvas::recalculateExtents()
25312532
#ifdef QGISDEBUG
25322533
std::cout << "Throwing exception "<< __FILE__ << __LINE__ << std::endl;
25332534
#endif
2534-
throw QgsCsException( string("NO COORDINATE TRANSFORM FOUND FOR LAYER") );
2535+
throw QgsCsException( std::string("NO COORDINATE TRANSFORM FOUND FOR LAYER") );
25352536
}
25362537

25372538
std::cout << "Transformed extent" <<
@@ -2555,7 +2556,7 @@ void QgsMapCanvas::recalculateExtents()
25552556
#ifdef QGISDEBUG
25562557
std::cout << "Throwing exception "<< __FILE__ << __LINE__ << std::endl;
25572558
#endif
2558-
throw QgsCsException( string("NO COORDINATE TRANSFORM FOUND FOR LAYER") );
2559+
throw QgsCsException( std::string("NO COORDINATE TRANSFORM FOUND FOR LAYER") );
25592560
}
25602561

25612562
updateFullExtent(lyr->coordinateTransform()->transformBoundingBox(lyr->extent()));

0 commit comments

Comments
 (0)
Please sign in to comment.