Fix bad backports

nyalldawson · nyalldawson · commit 6c0752e7ee89 · 2016-10-20T13:58:25.000+10:00
diff --git a/src/gui/qgsmapoverviewcanvas.cpp b/src/gui/qgsmapoverviewcanvas.cpp
@@ -293,7 +293,7 @@ void QgsPanningWidget::setPolygon( const QPolygon& p )
   mPoly = p;
 
   //ensure polygon is closed
-  if ( mPoly.at( 0 ) != mPoly.at( mPoly.length() - 1 ) )
+  if ( mPoly.at( 0 ) != mPoly.at( mPoly.size() - 1 ) )
     mPoly.append( mPoly.at( 0 ) );
 
   setGeometry( p.boundingRect() );
diff --git a/tests/src/core/testqgslegendrenderer.cpp b/tests/src/core/testqgslegendrenderer.cpp
@@ -341,7 +341,7 @@ void TestQgsLegendRenderer::testTallSymbol()
 {
   QString testName = "legend_tall_symbol";
 
-  QgsCategorizedSymbolRenderer* catRenderer = dynamic_cast<QgsCategorizedSymbolRenderer*>( mVL3->renderer() );
+  QgsCategorizedSymbolRendererV2* catRenderer = dynamic_cast<QgsCategorizedSymbolRendererV2*>( mVL3->renderer() );
   QVERIFY( catRenderer );
   catRenderer->updateCategoryLabel( 1, "This is\nthree lines\nlong label" );
 

Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@ void TestQgsLegendRenderer::testTallSymbol()`
`341`	`341`	`{`
`342`	`342`	`QString testName = "legend_tall_symbol";`
`343`	`343`
`344`		`- QgsCategorizedSymbolRenderer* catRenderer = dynamic_cast<QgsCategorizedSymbolRenderer*>( mVL3->renderer() );`
	`344`	`+ QgsCategorizedSymbolRendererV2* catRenderer = dynamic_cast<QgsCategorizedSymbolRendererV2*>( mVL3->renderer() );`
`345`	`345`	`QVERIFY( catRenderer );`
`346`	`346`	`catRenderer->updateCategoryLabel( 1, "This is\nthree lines\nlong label" );`
`347`	`347`