Avoid some compiler warnings

Author: nyalldawson

src/app/qgsmaplayerstyleguiutils.cpp

@@ -84,9 +84,13 @@ void QgsMapLayerStyleGuiUtils::addStyle()
   bool res = layer->styleManager()->addStyleFromLayer( text );
 
   if ( res ) // make it active!
+  {
     layer->styleManager()->setCurrentStyle( text );
+  }
   else
+  {
     QgsDebugMsg( "Failed to add style: " + text );
+  }
 }
 
 void QgsMapLayerStyleGuiUtils::useStyle()
@@ -103,7 +107,9 @@ void QgsMapLayerStyleGuiUtils::useStyle()
 
   bool res = layer->styleManager()->setCurrentStyle( name );
   if ( !res )
+  {
     QgsDebugMsg( "Failed to set current style: " + name );
+  }
 }
 
 
@@ -118,7 +124,9 @@ void QgsMapLayerStyleGuiUtils::removeStyle()
 
   bool res = layer->styleManager()->removeStyle( layer->styleManager()->currentStyle() );
   if ( !res )
+  {
     QgsDebugMsg( "Failed to remove current style" );
+  }
 }
 
 
@@ -142,5 +150,7 @@ void QgsMapLayerStyleGuiUtils::renameStyle()
 
   bool res = layer->styleManager()->renameStyle( name, text );
   if ( !res )
+  {
     QgsDebugMsg( "Failed to rename style: " + name );
+  }
 }

src/gui/qgsmapcanvassnapper.cpp

@@ -311,7 +311,8 @@ int QgsMapCanvasSnapper::snapToBackgroundLayers( const QgsPoint& point, QList<Qg
       if ( intersectionPoint->type()  == QGis::Point )
       {
         //We have to check the intersection point is inside the tolerance distance for both layers
-        double toleranceA, toleranceB;
+        double toleranceA = 0;
+        double toleranceB = 0;
         for ( int i = 0 ;i < snapLayers.size();++i )
         {
           if ( snapLayers[i].mLayer == oSegIt->layer )

src/gui/symbology-ng/qgsheatmaprendererwidget.cpp

@@ -160,12 +160,13 @@ void QgsHeatmapRendererWidget::on_mRadiusUnitWidget_changed()
     case 0:
       unit = QgsSymbolV2::Pixel;
       break;
-    case 1:
-      unit = QgsSymbolV2::MM;
-      break;
     case 2:
       unit = QgsSymbolV2::MapUnit;
       break;
+    case 1:
+    default:
+      unit = QgsSymbolV2::MM;
+      break;
   }
 
   mRenderer->setRadiusUnit( unit );

src/gui/symbology-ng/qgssymbollayerv2widget.cpp

@@ -3164,12 +3164,13 @@ void QgsRasterFillSymbolLayerWidget::on_mWidthUnitWidget_changed()
     case 0:
       unit = QgsSymbolV2::Pixel;
       break;
-    case 1:
-      unit = QgsSymbolV2::MM;
-      break;
     case 2:
       unit = QgsSymbolV2::MapUnit;
       break;
+    case 1:
+    default:
+      unit = QgsSymbolV2::MM;
+      break;
   }
 
   mLayer->setWidthUnit( unit );

src/providers/grass/qgsgrassfeatureiterator.cpp

@@ -624,6 +624,7 @@ QgsGrassFeatureSource::QgsGrassFeatureSource( const QgsGrassProvider* p )
   int layerId = QgsGrassProvider::openLayer( p->mGisdbase, p->mLocation, p->mMapset, p->mMapName, p->mLayerField );
 
   Q_ASSERT( layerId == mLayerId );
+  Q_UNUSED( layerId ); //avoid compilier warning
 }
 
 QgsGrassFeatureSource::~QgsGrassFeatureSource()