Remove some more QgsComposition::mapSettings use

Author: nyalldawson

src/core/composer/qgscomposermapgrid.cpp

@@ -636,14 +636,8 @@ void QgsComposerMapGrid::draw( QPainter* p )
   p->scale( 1 / dotsPerMM, 1 / dotsPerMM ); //scale painter from mm to dots
 
   //setup render context
-  QgsMapSettings ms = mComposerMap->composition()->mapSettings();
-  //context units should be in dots
-  ms.setOutputSize( QSizeF( mComposerMap->rect().width() * dotsPerMM, mComposerMap->rect().height() * dotsPerMM ).toSize() );
-  ms.setExtent( *mComposerMap->currentMapExtent() );
-  ms.setOutputDpi( p->device()->logicalDpiX() );
-  QgsRenderContext context = QgsRenderContext::fromMapSettings( ms );
+  QgsRenderContext context = QgsComposerUtils::createRenderContext( mComposition, *p );
   context.setForceVectorOutput( true );
-  context.setPainter( p );
   QgsExpressionContext expressionContext = createExpressionContext();
   context.setExpressionContext( expressionContext );
 

src/core/composer/qgscomposermapoverview.cpp

@@ -22,6 +22,7 @@
 #include "qgssymbol.h"
 #include "qgsmapsettings.h"
 #include "qgspainting.h"
+#include "qgscomposerutils.h"
 
 #include <QPainter>
 
@@ -91,14 +92,8 @@ void QgsComposerMapOverview::draw( QPainter *painter )
   double dotsPerMM = painter->device()->logicalDpiX() / 25.4;
 
   //setup render context
-  QgsMapSettings ms = mComposerMap->composition()->mapSettings();
-  //context units should be in dots
-  ms.setOutputSize( QSizeF( mComposerMap->rect().width() * dotsPerMM, mComposerMap->rect().height() * dotsPerMM ).toSize() );
-  ms.setExtent( *mComposerMap->currentMapExtent() );
-  ms.setOutputDpi( painter->device()->logicalDpiX() );
-  QgsRenderContext context = QgsRenderContext::fromMapSettings( ms );
+  QgsRenderContext context = QgsComposerUtils::createRenderContext( mComposition, *painter );
   context.setForceVectorOutput( true );
-  context.setPainter( painter );
   QgsExpressionContext expressionContext = createExpressionContext();
   context.setExpressionContext( expressionContext );