Fix deprecated warnings on Travis

nyalldawson · nyalldawson · commit 4f0b9dda79f2 · 2015-12-07T23:24:05.000+11:00
diff --git a/src/plugins/grass/qgsgrassregion.cpp b/src/plugins/grass/qgsgrassregion.cpp
@@ -59,8 +59,8 @@ void QgsGrassRegionEdit::canvasPressEvent( QgsMapMouseEvent * event )
 {
   QgsDebugMsg( "entered." );
   mDraw = true;
-  mRubberBand->reset( true );
-  mSrcRubberBand->reset( true );
+  mRubberBand->reset( QGis::Polygon );
+  mSrcRubberBand->reset( QGis::Polygon );
   emit captureStarted();
 
   mStartPoint = toMapCoordinates( event->pos() );
@@ -93,8 +93,8 @@ void QgsGrassRegionEdit::canvasReleaseEvent( QgsMapMouseEvent * event )
 //! called when map tool is about to get inactive
 void QgsGrassRegionEdit::deactivate()
 {
-  mRubberBand->reset( true );
-  mSrcRubberBand->reset( true );
+  mRubberBand->reset( QGis::Polygon );
+  mSrcRubberBand->reset( QGis::Polygon );
   QgsMapTool::deactivate();
 }
 
@@ -167,7 +167,7 @@ void QgsGrassRegionEdit::drawRegion( QgsMapCanvas *canvas, QgsRubberBand* rubber
   {
     transform( canvas, points, coordinateTransform );
   }
-  rubberBand->reset( isPolygon );
+  rubberBand->reset( isPolygon ? QGis::Polygon : QGis::Line );
   for ( int i = 0; i < points.size(); i++ )
   {
     bool update = false; // true to update canvas

Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,8 @@ void QgsGrassRegionEdit::canvasPressEvent( QgsMapMouseEvent * event )`
`59`	`59`	`{`
`60`	`60`	`QgsDebugMsg( "entered." );`
`61`	`61`	`mDraw = true;`
`62`		`- mRubberBand->reset( true );`
`63`		`- mSrcRubberBand->reset( true );`
	`62`	`+ mRubberBand->reset( QGis::Polygon );`
	`63`	`+ mSrcRubberBand->reset( QGis::Polygon );`
`64`	`64`	`emit captureStarted();`
`65`	`65`
`66`	`66`	`mStartPoint = toMapCoordinates( event->pos() );`
`@@ -93,8 +93,8 @@ void QgsGrassRegionEdit::canvasReleaseEvent( QgsMapMouseEvent * event )`
`93`	`93`	`//! called when map tool is about to get inactive`
`94`	`94`	`void QgsGrassRegionEdit::deactivate()`
`95`	`95`	`{`
`96`		`- mRubberBand->reset( true );`
`97`		`- mSrcRubberBand->reset( true );`
	`96`	`+ mRubberBand->reset( QGis::Polygon );`
	`97`	`+ mSrcRubberBand->reset( QGis::Polygon );`
`98`	`98`	`QgsMapTool::deactivate();`
`99`	`99`	`}`
`100`	`100`
`@@ -167,7 +167,7 @@ void QgsGrassRegionEdit::drawRegion( QgsMapCanvas canvas, QgsRubberBand rubber`
`167`	`167`	`{`
`168`	`168`	`transform( canvas, points, coordinateTransform );`
`169`	`169`	`}`
`170`		`- rubberBand->reset( isPolygon );`
	`170`	`+ rubberBand->reset( isPolygon ? QGis::Polygon : QGis::Line );`
`171`	`171`	`for ( int i = 0; i < points.size(); i++ )`
`172`	`172`	`{`
`173`	`173`	`bool update = false; // true to update canvas`