fix 62ea90c and globe plugin

jef-n · jef-n · commit b91d93e7c870 · 2016-09-20T00:58:35.000+02:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -5090,7 +5090,8 @@ void QgisApp::dxfExport()
       //extent
       if ( d.exportMapExtent() )
       {
-        dxfExport.setExtent( mapCanvas()->extent() );
+        QgsCoordinateTransform t( mapCanvas()->mapSettings().destinationCrs(), QgsCoordinateReferenceSystem( d.crs(), QgsCoordinateReferenceSystem::InternalCrsId ) );
+        dxfExport.setExtent( t.transformBoundingBox( mapCanvas()->extent() ) );
       }
     }
 
diff --git a/src/core/qgsdatasourceuri.h b/src/core/qgsdatasourceuri.h
@@ -238,7 +238,7 @@ class CORE_EXPORT QgsDataSourceUri
     bool mUseEstimatedMetadata;
     //! Disable SelectAtId capability (eg. to trigger the attribute table memory model for expensive views)
     bool mSelectAtIdDisabled;
-    //! geometry type (or QGis::WKBUnknown if not specified)
+    //! geometry type (or QgsWkbTypes::Unknown if not specified)
     QgsWkbTypes::Type mWkbType;
     //! SRID or a null string if not specified
     QString mSrid;
diff --git a/src/core/qgsprojectproperty.h b/src/core/qgsprojectproperty.h
@@ -51,7 +51,7 @@ class CORE_EXPORT QgsProperty
     QgsProperty()
     {}
 
-    virtual ~ QgsProperty()
+    virtual ~QgsProperty()
     {}
 
     /** Dumps out the keys and values
@@ -190,7 +190,7 @@ class CORE_EXPORT QgsPropertyKey : public QgsProperty
 {
   public:
     QgsPropertyKey( const QString &name = "" );
-    virtual ~ QgsPropertyKey();
+    virtual ~QgsPropertyKey();
 
     /// every key has a name
     // @{
diff --git a/src/core/symbology-ng/qgsrenderer.h b/src/core/symbology-ng/qgsrenderer.h
@@ -213,7 +213,7 @@ class CORE_EXPORT QgsFeatureRenderer
      * @param context render context
      * @note added in QGIS 2.12
      */
-    virtual QgsSymbolList symbols( QgsRenderContext& context ) {  Q_UNUSED( context ); return QgsSymbolList(); }
+    virtual QgsSymbolList symbols( QgsRenderContext& context ) { Q_UNUSED( context ); return QgsSymbolList(); }
 
     bool usingSymbolLevels() const { return mUsingSymbolLevels; }
     void setUsingSymbolLevels( bool usingSymbolLevels ) { mUsingSymbolLevels = usingSymbolLevels; }
diff --git a/src/plugins/globe/globe_plugin.cpp b/src/plugins/globe/globe_plugin.cpp
@@ -777,9 +777,10 @@ void GlobePlugin::addModelLayer( QgsVectorLayer* vLayer, QgsGlobeVectorLayerConf
   featureOpt.setLayer( vLayer );
   osgEarth::Style style;
 
-  if ( !vLayer->renderer()->symbols().isEmpty() )
+  QgsRenderContext ctx;
+  if ( !vLayer->renderer()->symbols( ctx ).isEmpty() )
   {
-    Q_FOREACH ( QgsSymbol* sym, vLayer->renderer()->symbols() )
+    Q_FOREACH ( QgsSymbol* sym, vLayer->renderer()->symbols( ctx ) )
     {
       if ( sym->type() == QgsSymbol::Line )
       {
diff --git a/src/providers/grass/qgsgrassgislib.cpp b/src/providers/grass/qgsgrassgislib.cpp
@@ -40,6 +40,7 @@ extern "C"
 #include "qgsgeometry.h"
 #include "qgsrectangle.h"
 #include "qgsconfig.h"
+#include "qgsunittypes.h"
 
 #include <QByteArray>
 #include <QFileDialog>
@@ -1060,7 +1061,7 @@ int GRASS_LIB_EXPORT G_get_cellhd( const char *name, const char *mapset, struct
 
 double QgsGrassGisLib::G_database_units_to_meters_factor( void )
 {
-  return QGis::fromUnitToUnitFactor( mCrs.mapUnits(), Qgis::Meters );
+  return QgsUnitTypes::fromUnitToUnitFactor( mCrs.mapUnits(), QgsUnitTypes::DistanceMeters );
 }
 
 double QgsGrassGisLib::G_area_of_cell_at_row( int row )

Original file line number	Diff line number	Diff line change
`@@ -5090,7 +5090,8 @@ void QgisApp::dxfExport()`
`5090`	`5090`	`//extent`
`5091`	`5091`	`if ( d.exportMapExtent() )`
`5092`	`5092`	`{`
`5093`		`- dxfExport.setExtent( mapCanvas()->extent() );`
	`5093`	`+ QgsCoordinateTransform t( mapCanvas()->mapSettings().destinationCrs(), QgsCoordinateReferenceSystem( d.crs(), QgsCoordinateReferenceSystem::InternalCrsId ) );`
	`5094`	`+ dxfExport.setExtent( t.transformBoundingBox( mapCanvas()->extent() ) );`
`5094`	`5095`	`}`
`5095`	`5096`	`}`
`5096`	`5097`
Original file line number	Diff line number	Diff line change
`@@ -777,9 +777,10 @@ void GlobePlugin::addModelLayer( QgsVectorLayer* vLayer, QgsGlobeVectorLayerConf`
`777`	`777`	`featureOpt.setLayer( vLayer );`
`778`	`778`	`osgEarth::Style style;`
`779`	`779`
`780`		`- if ( !vLayer->renderer()->symbols().isEmpty() )`
	`780`	`+ QgsRenderContext ctx;`
	`781`	`+ if ( !vLayer->renderer()->symbols( ctx ).isEmpty() )`
`781`	`782`	`{`
`782`		`- Q_FOREACH ( QgsSymbol* sym, vLayer->renderer()->symbols() )`
	`783`	`+ Q_FOREACH ( QgsSymbol* sym, vLayer->renderer()->symbols( ctx ) )`
`783`	`784`	`{`
`784`	`785`	`if ( sym->type() == QgsSymbol::Line )`
`785`	`786`	`{`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ extern "C"`
`40`	`40`	`#include "qgsgeometry.h"`
`41`	`41`	`#include "qgsrectangle.h"`
`42`	`42`	`#include "qgsconfig.h"`
	`43`	`+#include "qgsunittypes.h"`
`43`	`44`
`44`	`45`	`#include <QByteArray>`
`45`	`46`	`#include <QFileDialog>`
`@@ -1060,7 +1061,7 @@ int GRASS_LIB_EXPORT G_get_cellhd( const char name, const char mapset, struct`
`1060`	`1061`
`1061`	`1062`	`double QgsGrassGisLib::G_database_units_to_meters_factor( void )`
`1062`	`1063`	`{`
`1063`		`- return QGis::fromUnitToUnitFactor( mCrs.mapUnits(), Qgis::Meters );`
	`1064`	`+ return QgsUnitTypes::fromUnitToUnitFactor( mCrs.mapUnits(), QgsUnitTypes::DistanceMeters );`
`1064`	`1065`	`}`
`1065`	`1066`
`1066`	`1067`	`double QgsGrassGisLib::G_area_of_cell_at_row( int row )`