fix warnings

jef-n · jef-n · commit 00d60dbca3e0 · 2016-01-18T00:26:59.000+01:00
diff --git 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
 
-set -e
+ASTYLEOPTS=$(dirname $0)/astyle.options
+if type -p cygpath >/dev/null; then
+	ASTYLEOPTS="$(cygpath -w $ASTYLEOPTS)"
+fi
 
-astyleit()
-{
-	$ASTYLE \
-		"--options=$(dirname $0)/astyle.options" \
-		"$1"
+set -e
 
+astyleit() {
+	$ASTYLE --options="$ASTYLEOPTS" "$1"
 	scripts/unify_includes.pl "$1"
 }
 
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -35,7 +35,7 @@ struct SpatialiteBlobHeader
 {
   unsigned char start;
   unsigned char endianness;
-  uint32_t srid;
+  int32_t srid;
   double mbrMinX;
   double mbrMinY;
   double mbrMaxX;

Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,8 @@ QgsGeometry QgsInternalGeometryEngine::extrude( double x, double y )`
`54`	`54`	`linesToProcess << static_cast<QgsLineStringV2*>( curve->segmentize() );`
`55`	`55`	`}`
`56`	`56`
`57`		`- QgsMultiPolygonV2* multipolygon = linesToProcess.size() > 1 ? new QgsMultiPolygonV2() : nullptr;`
`58`		`- QgsPolygonV2* polygon;`
	`57`	`+ QgsMultiPolygonV2 *multipolygon = linesToProcess.size() > 1 ? new QgsMultiPolygonV2() : nullptr;`
	`58`	`+ QgsPolygonV2 *polygon = nullptr;`
`59`	`59`
`60`	`60`	`if ( !linesToProcess.empty() )`
`61`	`61`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2110,8 +2110,8 @@ static QVariant fcnAzimuth( const QVariantList& values, const QgsExpressionConte`
`2110`	`2110`	`return 0.0;`
`2111`	`2111`	`else if ( pt1->y() > pt2->y() )`
`2112`	`2112`	`return M_PI;`
`2113`		`- else return 0;`
`2114`		`- return 1;`
	`2113`	`+ else`
	`2114`	`+ return 0;`
`2115`	`2115`	`}`
`2116`	`2116`
`2117`	`2117`	`if ( pt1->y() == pt2->y() )`
`@@ -2120,8 +2120,8 @@ static QVariant fcnAzimuth( const QVariantList& values, const QgsExpressionConte`
`2120`	`2120`	`return M_PI / 2;`
`2121`	`2121`	`else if ( pt1->x() > pt2->x() )`
`2122`	`2122`	`return M_PI + ( M_PI / 2 );`
`2123`		`- else return 0;`
`2124`		`- return 1;`
	`2123`	`+ else`
	`2124`	`+ return 0;`
`2125`	`2125`	`}`
`2126`	`2126`
`2127`	`2127`	`if ( pt1->x() < pt2->x() )`
`@@ -2150,8 +2150,6 @@ static QVariant fcnAzimuth( const QVariantList& values, const QgsExpressionConte`
`2150`	`2150`	`+ ( M_PI + ( M_PI / 2 ) );`
`2151`	`2151`	`}`
`2152`	`2152`	`}`
`2153`		`-`
`2154`		`- return QVariant();`
`2155`	`2153`	`}`
`2156`	`2154`
`2157`	`2155`	`static QVariant fcnExtrude( const QVariantList& values, const QgsExpressionContext, QgsExpression parent )`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ struct SpatialiteBlobHeader`
`35`	`35`	`{`
`36`	`36`	`unsigned char start;`
`37`	`37`	`unsigned char endianness;`
`38`		`- uint32_t srid;`
	`38`	`+ int32_t srid;`
`39`	`39`	`double mbrMinX;`
`40`	`40`	`double mbrMinY;`
`41`	`41`	`double mbrMaxX;`