From 00d60dbca3e0b36850f28b104c0f0ac6cb049058 Mon Sep 17 00:00:00 2001
From: "Juergen E. Fischer" <jef@norbit.de>
Date: Mon, 18 Jan 2016 00:26:59 +0100
Subject: [PATCH] fix warnings

---
 scripts/astyle.sh                               | 14 +++++++-------
 src/core/geometry/qgsinternalgeometryengine.cpp |  4 ++--
 src/core/pal/feature.cpp                        |  3 +--
 src/core/qgsexpression.cpp                      | 10 ++++------
 src/core/symbology-ng/qgs25drenderer.cpp        |  2 +-
 src/providers/virtual/qgsvirtuallayerblob.h     |  2 +-
 6 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/scripts/astyle.sh b/scripts/astyle.sh
index 9883eb33505..7d8f0245e17 100755
--- a/scripts/astyle.sh
+++ b/scripts/astyle.sh
@@ -14,7 +14,6 @@
 #                                                                         #
 ###########################################################################
 
-
 for ASTYLE in $(dirname $0)/qgisstyle $(dirname $0)/RelWithDebInfo/qgisstyle
 do
 	if type -p $ASTYLE >/dev/null; then
@@ -48,14 +47,15 @@ if ! type -p autopep8 >/dev/null; then
 	}
 fi
 
+ASTYLEOPTS=$(dirname $0)/astyle.options
+if type -p cygpath >/dev/null; then
+	ASTYLEOPTS="$(cygpath -w $ASTYLEOPTS)"
+fi
+
 set -e
 
-astyleit()
-{
-	$ASTYLE \
-		"--options=$(dirname $0)/astyle.options" \
-		"$1"
-
+astyleit() {
+	$ASTYLE --options="$ASTYLEOPTS" "$1"
 	scripts/unify_includes.pl "$1"
 }
 
diff --git a/src/core/geometry/qgsinternalgeometryengine.cpp b/src/core/geometry/qgsinternalgeometryengine.cpp
index bfcf5e4da92..050ddf6656d 100644
--- a/src/core/geometry/qgsinternalgeometryengine.cpp
+++ b/src/core/geometry/qgsinternalgeometryengine.cpp
@@ -54,8 +54,8 @@ QgsGeometry QgsInternalGeometryEngine::extrude( double x, double y )
     linesToProcess << static_cast<QgsLineStringV2*>( curve->segmentize() );
   }
 
-  QgsMultiPolygonV2* multipolygon = linesToProcess.size() > 1 ? new QgsMultiPolygonV2() : nullptr;
-  QgsPolygonV2* polygon;
+  QgsMultiPolygonV2 *multipolygon = linesToProcess.size() > 1 ? new QgsMultiPolygonV2() : nullptr;
+  QgsPolygonV2 *polygon = nullptr;
 
   if ( !linesToProcess.empty() )
   {
diff --git a/src/core/pal/feature.cpp b/src/core/pal/feature.cpp
index 6c27979e271..080a6a6c8b0 100644
--- a/src/core/pal/feature.cpp
+++ b/src/core/pal/feature.cpp
@@ -324,7 +324,7 @@ int FeaturePart::createCandidatesAtOrderedPositionsOverPoint( double x, double y
     double alpha = 0.0;
     double deltaX = 0;
     double deltaY = 0;
-    LabelPosition::Quadrant quadrant;
+    LabelPosition::Quadrant quadrant = LabelPosition::QuadrantAboveLeft;
     switch ( position )
     {
       case QgsPalLayerSettings::TopLeft:
@@ -421,7 +421,6 @@ int FeaturePart::createCandidatesAtOrderedPositionsOverPoint( double x, double y
 
     lPos << new LabelPosition( i, labelX, labelY, labelWidth, labelHeight, angle, cost, this, false, quadrant );
 
-
     //TODO - tweak
     cost += 0.001;
 
diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
index 51badb48128..587d03a8ea2 100644
--- a/src/core/qgsexpression.cpp
+++ b/src/core/qgsexpression.cpp
@@ -2110,8 +2110,8 @@ static QVariant fcnAzimuth( const QVariantList& values, const QgsExpressionConte
       return 0.0;
     else if ( pt1->y() > pt2->y() )
       return M_PI;
-    else return 0;
-    return 1;
+    else
+      return 0;
   }
 
   if ( pt1->y() == pt2->y() )
@@ -2120,8 +2120,8 @@ static QVariant fcnAzimuth( const QVariantList& values, const QgsExpressionConte
       return M_PI / 2;
     else if ( pt1->x() > pt2->x() )
       return M_PI + ( M_PI / 2 );
-    else return 0;
-    return 1;
+    else
+      return 0;
   }
 
   if ( pt1->x() < pt2->x() )
@@ -2150,8 +2150,6 @@ static QVariant fcnAzimuth( const QVariantList& values, const QgsExpressionConte
              + ( M_PI + ( M_PI / 2 ) );
     }
   }
-
-  return QVariant();
 }
 
 static QVariant fcnExtrude( const QVariantList& values, const QgsExpressionContext*, QgsExpression* parent )
diff --git a/src/core/symbology-ng/qgs25drenderer.cpp b/src/core/symbology-ng/qgs25drenderer.cpp
index 13fef6b7d5e..3654a0debdf 100644
--- a/src/core/symbology-ng/qgs25drenderer.cpp
+++ b/src/core/symbology-ng/qgs25drenderer.cpp
@@ -84,7 +84,7 @@ Qgs25DRenderer::Qgs25DRenderer()
   setShadowSpread( 4 );
   setShadowColor( QColor( "#1111111" ) );
 
-  setHeight( 20 );
+  setHeight( "20" );
   setAngle( 40 );
 
   QgsFeatureRequest::OrderBy orderBy;
diff --git a/src/providers/virtual/qgsvirtuallayerblob.h b/src/providers/virtual/qgsvirtuallayerblob.h
index 45955855f9a..d28fd1cb117 100644
--- a/src/providers/virtual/qgsvirtuallayerblob.h
+++ b/src/providers/virtual/qgsvirtuallayerblob.h
@@ -35,7 +35,7 @@ struct SpatialiteBlobHeader
 {
   unsigned char start;
   unsigned char endianness;
-  uint32_t srid;
+  int32_t srid;
   double mbrMinX;
   double mbrMinY;
   double mbrMaxX;