fix warnings

qgis · Nov 17, 2013 · 36630af · 36630af
1 parent bc73b4e
commit 36630af
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/plugins/globe/globe_plugin.cpp b/src/plugins/globe/globe_plugin.cpp
@@ -286,8 +286,8 @@ void GlobePlugin::run()
 
     // Initialize the sky node if required
     setSkyParameters( settings.value( "/Plugin-Globe/skyEnabled", false ).toBool()
-                , settings.value( "/Plugin-Globe/skyDateTime", QDateTime() ).toDateTime()
-                , settings.value( "/Plugin-Globe/skyAutoAmbient", false ).toBool() );
+                      , settings.value( "/Plugin-Globe/skyDateTime", QDateTime() ).toDateTime()
+                      , settings.value( "/Plugin-Globe/skyAutoAmbient", false ).toBool() );
 
     // create a surface to house the controls
 #if OSGEARTH_VERSION_GREATER_OR_EQUAL( 2, 1, 1 )
@@ -847,9 +847,9 @@ void GlobePlugin::setSkyParameters( bool enabled, const QDateTime& dateTime, boo
       if ( !mSkyNode.get() )
         mSkyNode = new SkyNode( mMapNode->getMap() );
 
-  #if OSGEARTH_VERSION_GREATER_OR_EQUAL( 2, 4, 0 )
+#if OSGEARTH_VERSION_GREATER_OR_EQUAL( 2, 4, 0 )
       mSkyNode->setAutoAmbience( autoAmbience );
-  #endif
+#endif
       mSkyNode->setDateTime( dateTime.date().year()
                              , dateTime.date().month()
                              , dateTime.date().day()
@@ -902,6 +902,10 @@ void GlobePlugin::help()
 void GlobePlugin::placeNode( osg::Node* node, double lat, double lon, double alt /*= 0.0*/ )
 {
 #ifdef HAVE_OSGEARTH_ELEVATION_QUERY
+  Q_UNUSED( node );
+  Q_UNUSED( lat );
+  Q_UNUSED( lon );
+  Q_UNUSED( alt );
 #else
   // get elevation
   double elevation = 0.0;

diff --git a/src/providers/oracle/qgsoraclefeatureiterator.cpp b/src/providers/oracle/qgsoraclefeatureiterator.cpp
@@ -44,6 +44,9 @@ QgsOracleFeatureIterator::QgsOracleFeatureIterator( QgsOracleProvider *p, const
 
   switch ( request.filterType() )
   {
+    case QgsFeatureRequest::FilterExpression:
+      break;
+
     case QgsFeatureRequest::FilterRect:
       if ( !P->mGeometryColumn.isNull() )
       {