fix build

jef-n · jef-n · commit aa0b94a7c84e · 2016-07-22T15:25:04.000+02:00
diff --git a/src/plugins/globe/featuresource/qgsglobefeaturesource.cpp b/src/plugins/globe/featuresource/qgsglobefeaturesource.cpp
@@ -95,13 +95,13 @@ osgEarth::Features::Geometry::Type QgsGlobeFeatureSource::getGeometryType() cons
 {
   switch ( mLayer->geometryType() )
   {
-    case  QGis::Point:
+    case Qgis::Point:
       return osgEarth::Features::Geometry::TYPE_POINTSET;
 
-    case QGis::Line:
+    case Qgis::Line:
       return osgEarth::Features::Geometry::TYPE_LINESTRING;
 
-    case QGis::Polygon:
+    case Qgis::Polygon:
       return osgEarth::Features::Geometry::TYPE_POLYGON;
 
     default:
diff --git a/src/plugins/globe/featuresource/qgsglobefeatureutils.h b/src/plugins/globe/featuresource/qgsglobefeatureutils.h
@@ -101,7 +101,7 @@ class QgsGlobeFeatureUtils
           return pointSet;
         }
 
-        case QGis::WKBMultiPoint:
+        case Qgis::WKBMultiPoint:
         {
           osgEarth::Features::PointSet* pointSet = new osgEarth::Features::PointSet();
           QgsMultiPointV2* multiPoint = static_cast<QgsMultiPointV2*>( geom.geometry() );
diff --git a/src/plugins/globe/qgsglobefeatureidentify.cpp b/src/plugins/globe/qgsglobefeatureidentify.cpp
@@ -25,7 +25,7 @@
 #include <osgEarth/Registry>
 
 QgsGlobeFeatureIdentifyCallback::QgsGlobeFeatureIdentifyCallback( QgsMapCanvas* mapCanvas )
-    : mCanvas( mapCanvas ), mRubberBand( new QgsRubberBand( mapCanvas, QGis::Polygon ) )
+    : mCanvas( mapCanvas ), mRubberBand( new QgsRubberBand( mapCanvas, Qgis::Polygon ) )
 {
   QColor color( Qt::green );
   color.setAlpha( 190 );
@@ -66,7 +66,7 @@ void QgsGlobeFeatureIdentifyCallback::onHit( osgEarth::ObjectID id )
       if ( feat.isValid() )
         mRubberBand->setToGeometry( feat.geometry(), lyr );
       else
-        mRubberBand->reset( QGis::Polygon );
+        mRubberBand->reset( Qgis::Polygon );
     }
   }
   else
@@ -82,5 +82,5 @@ void QgsGlobeFeatureIdentifyCallback::onMiss( const EventArgs &/*args*/ )
 void QgsGlobeFeatureIdentifyCallback::onMiss()
 #endif
 {
-  mRubberBand->reset( QGis::Polygon );
+  mRubberBand->reset( Qgis::Polygon );
 }
diff --git a/src/plugins/globe/qgsglobefrustumhighlight.cpp b/src/plugins/globe/qgsglobefrustumhighlight.cpp
@@ -26,7 +26,7 @@ QgsGlobeFrustumHighlightCallback::QgsGlobeFrustumHighlightCallback( osg::View* v
     : osg::NodeCallback()
     , mView( view )
     , mTerrain( terrain )
-    , mRubberBand( new QgsRubberBand( mapCanvas, QGis::Polygon ) )
+    , mRubberBand( new QgsRubberBand( mapCanvas, Qgis::Polygon ) )
     , mSrs( osgEarth::SpatialReference::create( mapCanvas->mapRenderer()->destinationCrs().toWkt().toStdString() ) )
 {
   mRubberBand->setColor( color );
@@ -49,7 +49,7 @@ void QgsGlobeFrustumHighlightCallback::operator()( osg::Node*, osg::NodeVisitor*
   mTerrain->getWorldCoordsUnderMouse( mView, width - 1, height - 1, corners[2] );
   mTerrain->getWorldCoordsUnderMouse( mView, width - 1, 0,          corners[3] );
 
-  mRubberBand->reset( QGis::Polygon );
+  mRubberBand->reset( Qgis::Polygon );
   for ( int i = 0; i < 4; i++ )
   {
     osg::Vec3d localCoords;
diff --git a/src/plugins/globe/qgsglobetilesource.cpp b/src/plugins/globe/qgsglobetilesource.cpp
@@ -99,14 +99,14 @@ QgsMapSettings QgsGlobeTileImage::createSettings( int dpi , const QStringList &l
 {
   QgsMapSettings settings;
   settings.setBackgroundColor( QColor( Qt::transparent ) );
-  settings.setDestinationCrs( QgsCRSCache::instance()->crsByAuthId( GEO_EPSG_CRS_AUTHID ) );
+  settings.setDestinationCrs( QgsCrsCache::instance()->crsByAuthId( GEO_EPSG_CRS_AUTHID ) );
   settings.setCrsTransformEnabled( true );
   settings.setExtent( mTileExtent );
   settings.setLayers( layerSet );
   settings.setFlag( QgsMapSettings::DrawEditingInfo, false );
   settings.setFlag( QgsMapSettings::DrawLabeling, false );
   settings.setFlag( QgsMapSettings::DrawSelection, false );
-  settings.setMapUnits( QGis::Degrees );
+  settings.setMapUnits( Qgis::Degrees );
   settings.setOutputSize( QSize( mTileSize, mTileSize ) );
   settings.setOutputImageFormat( QImage::Format_ARGB32_Premultiplied );
   settings.setOutputDpi( dpi );
diff --git a/src/plugins/globe/qgsglobevectorlayerproperties.h b/src/plugins/globe/qgsglobevectorlayerproperties.h
@@ -25,6 +25,7 @@
 
 class QgsGlobeVectorLayerConfig;
 class QgsMapLayer;
+class QgsVectorLayer;
 class QDomDocument;
 class QDomElement;
 class QListWidgetItem;

Original file line number	Diff line number	Diff line change
`@@ -95,13 +95,13 @@ osgEarth::Features::Geometry::Type QgsGlobeFeatureSource::getGeometryType() cons`
`95`	`95`	`{`
`96`	`96`	`switch ( mLayer->geometryType() )`
`97`	`97`	`{`
`98`		`- case QGis::Point:`
	`98`	`+ case Qgis::Point:`
`99`	`99`	`return osgEarth::Features::Geometry::TYPE_POINTSET;`
`100`	`100`
`101`		`- case QGis::Line:`
	`101`	`+ case Qgis::Line:`
`102`	`102`	`return osgEarth::Features::Geometry::TYPE_LINESTRING;`
`103`	`103`
`104`		`- case QGis::Polygon:`
	`104`	`+ case Qgis::Polygon:`
`105`	`105`	`return osgEarth::Features::Geometry::TYPE_POLYGON;`
`106`	`106`
`107`	`107`	`default:`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ class QgsGlobeFeatureUtils`
`101`	`101`	`return pointSet;`
`102`	`102`	`}`
`103`	`103`
`104`		`- case QGis::WKBMultiPoint:`
	`104`	`+ case Qgis::WKBMultiPoint:`
`105`	`105`	`{`
`106`	`106`	`osgEarth::Features::PointSet* pointSet = new osgEarth::Features::PointSet();`
`107`	`107`	`QgsMultiPointV2* multiPoint = static_cast<QgsMultiPointV2*>( geom.geometry() );`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`#include <osgEarth/Registry>`
`26`	`26`
`27`	`27`	`QgsGlobeFeatureIdentifyCallback::QgsGlobeFeatureIdentifyCallback( QgsMapCanvas* mapCanvas )`
`28`		`- : mCanvas( mapCanvas ), mRubberBand( new QgsRubberBand( mapCanvas, QGis::Polygon ) )`
	`28`	`+ : mCanvas( mapCanvas ), mRubberBand( new QgsRubberBand( mapCanvas, Qgis::Polygon ) )`
`29`	`29`	`{`
`30`	`30`	`QColor color( Qt::green );`
`31`	`31`	`color.setAlpha( 190 );`
`@@ -66,7 +66,7 @@ void QgsGlobeFeatureIdentifyCallback::onHit( osgEarth::ObjectID id )`
`66`	`66`	`if ( feat.isValid() )`
`67`	`67`	`mRubberBand->setToGeometry( feat.geometry(), lyr );`
`68`	`68`	`else`
`69`		`- mRubberBand->reset( QGis::Polygon );`
	`69`	`+ mRubberBand->reset( Qgis::Polygon );`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`	`else`
`@@ -82,5 +82,5 @@ void QgsGlobeFeatureIdentifyCallback::onMiss( const EventArgs &/args/ )`
`82`	`82`	`void QgsGlobeFeatureIdentifyCallback::onMiss()`
`83`	`83`	`#endif`
`84`	`84`	`{`
`85`		`- mRubberBand->reset( QGis::Polygon );`
	`85`	`+ mRubberBand->reset( Qgis::Polygon );`
`86`	`86`	`}`