Do not #include QtConcurrent when using map renderer jobs C++ API

wonder-sk · wonder-sk · commit c340e37e8860 · 2017-06-08T15:56:56.000+02:00
This way C++ apps using the API do not need to add QtConcurrent to their build
diff --git a/src/core/qgsmaprenderercustompainterjob.cpp b/src/core/qgsmaprenderercustompainterjob.cpp
@@ -24,6 +24,8 @@
 #include "qgsrenderer.h"
 #include "qgsmaplayerlistutils.h"
 
+#include <QtConcurrentRun>
+
 QgsMapRendererCustomPainterJob::QgsMapRendererCustomPainterJob( const QgsMapSettings &settings, QPainter *painter )
   : QgsMapRendererJob( settings )
   , mPainter( painter )
diff --git a/src/core/qgsmaprendererjob.h b/src/core/qgsmaprendererjob.h
@@ -19,7 +19,6 @@
 #include "qgis_core.h"
 #include "qgis_sip.h"
 #include "qgis.h"
-#include <QtConcurrentRun>
 #include <QFutureWatcher>
 #include <QImage>
 #include <QPainter>
diff --git a/src/core/qgsmaprendererparalleljob.cpp b/src/core/qgsmaprendererparalleljob.cpp
@@ -24,6 +24,7 @@
 #include "qgsmaplayerlistutils.h"
 
 #include <QtConcurrentMap>
+#include <QtConcurrentRun>
 
 QgsMapRendererParallelJob::QgsMapRendererParallelJob( const QgsMapSettings &settings )
   : QgsMapRendererQImageJob( settings )
diff --git a/src/core/qgsmapsettings.cpp b/src/core/qgsmapsettings.cpp
@@ -50,8 +50,7 @@ QgsMapSettings::QgsMapSettings()
   , mMapUnitsPerPixel( 1 )
   , mScale( 1 )
 {
-  // set default map units - we use WGS 84 thus use degrees
-  mScaleCalculator.setMapUnits( QgsUnitTypes::DistanceDegrees );
+  mScaleCalculator.setMapUnits( QgsUnitTypes::DistanceUnknownUnit );
 
   updateDerived();
 }

Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,7 @@ QgsMapSettings::QgsMapSettings()`
`50`	`50`	`, mMapUnitsPerPixel( 1 )`
`51`	`51`	`, mScale( 1 )`
`52`	`52`	`{`
`53`		`- // set default map units - we use WGS 84 thus use degrees`
`54`		`- mScaleCalculator.setMapUnits( QgsUnitTypes::DistanceDegrees );`
	`53`	`+ mScaleCalculator.setMapUnits( QgsUnitTypes::DistanceUnknownUnit );`
`55`	`54`
`56`	`55`	`updateDerived();`
`57`	`56`	`}`